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

fixed conflict request_bill_con and origami index

Browse Source
This commit is contained in:
Aung Myo
2017-06-07 16:48:28 +06:30
parent 387ffa996b 4323da6589
commit 9ad04323f0
28 changed files with 264 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,3 +25,15 @@
.long{
width:100%
}
.purple {
background-color:#7a62d3;
}
.red {
background-color:#ff0000;
}
.green{
background-color: #009900
}

10
app/controllers/origami/credit_payments_controller.rb Normal file
View File

@@ -0,0 +1,10 @@
class Origami::CreditPaymentsController < BaseOrigamiController
def index
end
def create
end
end

10
app/controllers/origami/others_payments_controller.rb Normal file
View File

@@ -0,0 +1,10 @@
class Origami::OthersPaymentsController < BaseOrigamiController
def index
end
def create
end
end

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

@@ -2,13 +2,23 @@ class Origami::PaymentsController < BaseOrigamiController
def index
end
def create
cash = params[:cash]
sale_id = params[:sale_id]
if(Sale.exists?(sale_id))
saleObj = Sale.find(sale_id)
sale_payment = SalePayment.new
sale_payment.process_payment(saleObj, @user, cash)
end
end
def show
sale_id = params[:sale_id]
if Sale.exists?(sale_id)
@sale_data = Sale.find_by_sale_id(sale_id)
end
end
end

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

@@ -25,8 +25,3 @@ class Origami::RequestBillsController < BaseOrigamiController
printer.print_receipt_bill(print_settings,@sale_items,@sale,@sale_data)
end
end

2
app/controllers/settings/set_menu_items_controller.rb
View File

@@ -81,6 +81,6 @@ class Settings::SetMenuItemsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def settings_menu_item_params
params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:account_id , :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
end
end

2
app/controllers/settings/simple_menu_items_controller.rb
View File

@@ -78,6 +78,6 @@ class Settings::SimpleMenuItemsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def settings_menu_item_params
params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id,:account_id,:item_attributes, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
end
end

4
app/models/account.rb
View File

@@ -3,5 +3,7 @@ class Account < ApplicationRecord
has_many :menu_items
# belongs_to :lookup , :class_name => "Lookup"
def self.collection
Account.select("id, title").map { |e| [e.title, e.id] }
end
end

2
app/models/menu_item.rb
View File

@@ -1,10 +1,10 @@
class MenuItem < ApplicationRecord
#belongs_to :account
belongs_to :menu_category, :optional => true
has_many :menu_item_instances
belongs_to :parent, :class_name => "MenuItem", foreign_key: "menu_item_id", :optional => true
has_many :children, :class_name => "MenuItem", foreign_key: "menu_item_id"
belongs_to :account
validates_presence_of :item_code, :name, :type, :min_qty, :taxable, :min_selectable_item, :max_selectable_item

15
app/models/sale.rb
View File

@@ -1,6 +1,6 @@
class Sale < ApplicationRecord
self.primary_key = "sale_id"
#primary key - need to be unique generated for multiple shops
before_create :generate_custom_id
@@ -17,6 +17,7 @@ class Sale < ApplicationRecord
scope :open_invoices, -> { where("sale_status = 'new' and receipt_date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
def generate_invoice_from_booking(booking_id, requested_by)
puts "get invoice from booking"
booking = Booking.find(booking_id)
status = false
Rails.logger.debug "Booking -> " + booking.id.to_s
@@ -32,6 +33,7 @@ class Sale < ApplicationRecord
booking.sale_id = sale_id
end
order = booking.booking_orders.take.order
puts "add sale order"
link_order_sale(order.id)
return status
end
@@ -68,8 +70,8 @@ class Sale < ApplicationRecord
add_item(item)
end
link_order_sale(order.id)
link_order_sale(order.id)
end
@@ -226,9 +228,14 @@ class Sale < ApplicationRecord
def link_order_sale(order_id)
#create if it doesn't exist
if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?)
saleOrder = SaleOrder.where("sale_id=? and order_id=?", self.id, order_id).take
if saleOrder.nil?
SaleOrder.create(:sale_id => self.id, :order_id => order_id)
end
# if (SaleOrder.where("sale_id = #{self.id} and order_id=#{order_id}").nil?)
# SaleOrder.create(:sale_id => self.id, :order_id => order_id)
# end
#dosomrting here
#puts Time.now.format(":short")
end

5
app/models/sale_audit.rb
View File

@@ -1,6 +1,6 @@
class SaleAudit < ApplicationRecord
self.primary_key = "sale_audit_id"
#primary key - need to be unique generated for SaleAudit
before_create :generate_custom_id
@@ -44,13 +44,14 @@ class SaleAudit < ApplicationRecord
sale_audit.save!
end
def record_payment(sale_id, remark, action_by)
def self.record_payment(sale_id, remark, action_by)
sale_audit = SaleAudit.new()
sale_audit.sale_id = sale_id
sale_audit.action = "SALEPAYMENT"
sale_audit.action_at = DateTime.now.utc
sale_audit.action_by = action_by
sale_audit.remark = remark
sale_audit.approved_by = Time.now
sale_audit.save!
end

70
app/models/sale_payment.rb
View File

@@ -1,17 +1,21 @@
class SalePayment < ApplicationRecord
self.primary_key = "sale_payment_id"
#primary key - need to be unique generated for multiple shops
before_create :generate_custom_id
belongs_to :sale
:attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status
attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status
def process_payment(invoice, action_by, cash_amount)
def process_payment(invoice, action_by)
self.sale = invoice
self.received_amount = cash_amount
payment_method = "cash"
amount_due = invoice.grand_total
#get all payment for this invoices
invoice.sale_payments.each do |payment|
if (payment.payment_status == "paid" )
@@ -22,32 +26,33 @@ class SalePayment < ApplicationRecord
if (amount_due > 0)
payment_status = false
#route to payment type
switch (payment_method)
case "cash"
case payment_method
when "cash"
payment_status = cash_payment
case "creditnote"
payment_status = creditnote_payment
case "visa"
payment_status = external_terminal_card_payment(:visa)
case "master"
payment_status = external_terminal_card_payment(:master)
case "jcb"
payment_status = external_terminal_card_payment(:jcb)
case "mpu"
payment_status = external_terminal_card_payment(:mpu)
case "unionpay"
payment_status = external_terminal_card_payment(:unionpay)
case "vochure"
payment_status = vochure_payment
case "giftcard"
payment_status = giftcard_payment
case "paypar"
#TODO: implement paypar implementation
when "creditnote"
if !self.customer_id.nil?
payment_status = creditnote_payment(self.customer_id)
end
when "visa"
payment_status = external_terminal_card_payment(:visa)
when "master"
payment_status = external_terminal_card_payment(:master)
when "jcb"
payment_status = external_terminal_card_payment(:jcb)
when "mpu"
payment_status = external_terminal_card_payment(:mpu)
when "unionpay"
payment_status = external_terminal_card_payment(:unionpay)
when "vochure"
payment_status = vochure_payment
when "giftcard"
payment_status = giftcard_payment
when "paypar"
payment_status = paypar_payment
else
puts "it was something else"
end
#record an payment in sale-audit
remark = "Payment #{payment_method}- for Invoice #{invoice.receipt_no} Due [#{amount_due}]| pay amount -> #{amount} | Payment Status ->#{payment_status}"
sale_audit = SaleAudit.record_payment(invoice.id, remark, action_by)
@@ -66,10 +71,9 @@ class SalePayment < ApplicationRecord
private
def cash_payment
payment_status = false
self.payment_method = "cash"
self.payment_amount = self.received_amount
self.outstanding_amount = self.sale.grand_total - received_amount
self.outstanding_amount = self.sale.grand_total - self.received_amount
self.payment_status = "paid"
payment_method = self.save!
@@ -78,7 +82,8 @@ class SalePayment < ApplicationRecord
return payment_status
end
def creditnote_payment(self.customer_id)
def creditnote_payment(customer_id)
payment_status = false
self.payment_method = "creditnote"
@@ -147,11 +152,12 @@ class SalePayment < ApplicationRecord
end
def sale_update_payment_status(paid_amount)
puts "paid_amount"
puts paid_amount
#update amount_outstanding
self.sale.amount_received = self.sale.amount_received + paid_amount
self.sale.amount_changed = amount - self.sale.amount_received
if (self.sale.grand_total <= self.sale.amount_received && self.sale.amount_changed > 0)
self.sale.amount_changed = amount - self.sale.amount_received
if (self.sale.grand_total <= self.sale.amount_received && self.sale.amount_changed > 0)
self.sale.payment_status = "paid"
self.sale.sale_status = "completed"
self.sale.save!

1
app/views/origami/credit_payments/index.html.erb Normal file
View File

@@ -0,0 +1 @@
hello Credit

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

@@ -190,13 +190,13 @@
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Move</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Customer</button>
<!-- <button type="button" class="btn btn-primary btn-lg btn-block" disabled>Req.Bill</button> -->
<button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block">
<button type="button" id="request_bills" class="btn btn-primary btn-lg btn-block" disabled>
Req.Bill
</button>
<!-- 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" id="pay" class="btn btn-primary btn-lg btn-block" >Pay</button>
<button type="button" id="pay" class="btn btn-primary btn-lg btn-block" disabled >Pay</button>
<button type="button" class="btn btn-primary btn-lg btn-block" disabled>Re.Print</button>
</div>
</div>
@@ -217,12 +217,14 @@ function callOrderDetails(sale_order_id){
order_id = sale_order_id.split("_")[1]
url = "origami/"+sale_order_id.split("_")[1]
data_val = { sale_id: sale_order_id.split("_")[1]}
$("#pay").prop('disabled',false);
$("#request_bills").prop('disabled',true);
}else{
order_id = sale_order_id.split("_")[1]
url = "origami/"+order_id
data_val = { order_id: sale_order_id.split("_")[1]}
$("#request_bills").prop('disabled',false);
$("#pay").prop('disabled',true);
}
table_or_order_id = order_id
@@ -314,14 +316,16 @@ $( document ).ready(function() {
window.location.href = '/origami/request_bills/'+ table_or_order_id
return false;
});
$('#pay').click(function() {
window.location.href = '/origami/sale/'+ pay_sale_id + "/payment"
return false;
});
});
$( document ).ready(function() {
$('#pay').click(function() {
window.location.href = '/origami/sale/'+pay_sale_id +"/payment"
return false;
});
});
</script>
<style type="text/css">

1
app/views/origami/others_payments/index.html.erb Normal file
View File

@@ -0,0 +1 @@
Hello Card Payment

140
app/views/origami/request_bills/show.html.erb → app/views/origami/payments/show.html.erb
View File

@@ -5,8 +5,9 @@
<div class="card-header">
<div id="order-title">
<span><strong>Receipt No : <%=@sale_data.receipt_no rescue ' '%></strong></span>
<span style="margin-left: 40%"><strong>Receipt Date : <%=@sale_data.receipt_date rescue '-'%></strong></span>
<span style="margin-left: 24%"><strong>Receipt Date : <%=@sale_data.receipt_date.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></strong></span>
<span><strong>Table No</strong> <% if @sale_data%>- <%=@sale_data.receipt_no%><% end %></span>
<span style="margin-left: 27%"><strong>Sale Id</strong> </span><span id="sale_id"><% if @sale_data %><%=@sale_data.sale_id %><% end %></span>
</div>
</div>
<div class="card-block">
@@ -61,38 +62,38 @@
</tr>
</tfooter>
</table>
</div>
</div>
<div style='text-align:center;margin-top:20px'>
<INPUT TYPE="Button" class='btn btn-primary' VALUE="Reprint" onClick="" style='width:120px'/>
<INPUT TYPE="Submit" class='btn btn-primary' VALUE="CANCEL" action="origami/index" style='width:120px'/>
<!-- <INPUT TYPE="Button" class='btn btn-primary' VALUE="Reprint" onClick="" style='width:120px'/>
<INPUT TYPE="Submit" class='btn btn-primary' VALUE="CANCEL" action="origami/index" style='width:120px'/> -->
</div>
</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 class="col-md-8"><strong>AMOUNT DUE</strong></div>
<div class="col-md-4"><strong><span id="amount_due"><%= @sale_data.grand_total %></span></strong></div>
</div>
<hr>
<div class="row">
<div class="col-md-8">CASH</div>
<div class="col-md-4">0.0</div>
<div class="col-md-4" id="cash" >0.0</div>
</div>
<hr>
<div class="row">
<div class="row" id="credit_payment">
<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="row" id="card_payment">
<div class="col-md-8">OTHERS PAYMENT</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 class="col-md-4"><span id='balance'><%= @sale_data.grand_total %></span></div>
</div>
<hr>
<div class="row">
@@ -100,61 +101,61 @@
<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 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 cashier_number" data-value="3" data-type="num">3</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long">1000</div>
<div class="col-md-12 cashier_number long" data-value="1000" data-type="add">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 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 cashier_number" data-value="6" data-type="num">6</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long">5000</div>
<div class="col-md-12 cashier_number long" data-value="5000" data-type="add">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 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 cashier_number" data-value="9" data-type="num">9</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long">10000</div>
<div class="col-md-12 cashier_number long" data-value="10000" data-type="add">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 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 cashier_number" data-value="00" data-type="num">00</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long">50000</div>
<div class="col-md-12 cashier_number long" data-value="50000" data-type="add">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 class="col-md-3 cashier_number red" data-type="del">DEL</div>
<div class="col-md-3 cashier_number green" data-type="clr">CLR</div>
</div>
</div>
<div class="col-md-5">
<div class="col-md-12 cashier_number long">ENTER</div>
<div class="col-md-12 cashier_number long purple " id="pay">PAY</div>
</div>
</div>
</div>
@@ -167,13 +168,84 @@ $(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) {
var original_value;
original_value = $('#cash').text();
}
event.handled = true;
var input_type = $(this).attr("data-type");
switch (input_type) {
case 'num':
var input_value = $(this).attr("data-value");
if (original_value == "0.0"){
$('#cash').text(input_value);
update_balance();
}else{
$('#cash').append(input_value);
update_balance();
}
break;
case 'add':
var input_value = $(this).attr("data-value");
amount = parseInt(input_value) + parseInt(original_value);
$('#cash').text(amount);
update_balance();
break;
case 'clr':
$('#cash').text("0.0");
update_balance();
break;
}
event.handled = true;
} else {
return false;
}
});
$( document ).ready(function() {
$('#credit_payment').click(function() {
var sale_id = $('#sale_id').text();
window.location.href = '/origami/sale/'+ sale_id + "/payment/credit_payment"
return false;
});
$('#card_payment').click(function() {
var sale_id = $('#sale_id').text();
window.location.href = '/origami/sale/'+ sale_id + "/payment/others_payment"
return false;
});
$('#pay').click(function() {
if($('#balance').text() > 0){
alert(" Insufficient Amount!")
}else{
// payment
var cash = $('#cash').text();
var credit = $('#credit').text();
var card = $('#card').text();
var sale_id = $('#sale_id').text();
$.ajax({type: "POST",
url: "<%= origami_payment_process_path %>",
data: "cash="+ cash + "&sale_id=" + sale_id,
success:function(result){
alert("THANK YOU")
}
});
}
});
});
function update_balance(){
var cash = $('#cash').text();
var credit = $('#credit').text();
var card = $('#card').text();
var amount_due = $('#amount_due').text();
var total = cash + credit + card
var result = amount_due - total
$('#balance').text(result);
}
</script>

3
app/views/settings/menu_item_options/show.html.erb
View File

@@ -2,8 +2,7 @@
<div class="page-header">
<ul class="breadcrumb">
<li><a href="<%= %>">Home</a></li>
<li>Settings</li>
<li>Menu Item Option</li>
<li><a href="<%= settings_menu_item_options_path %>">Menu Item Options</a></li>
<span style="float: right">
</span>
</ul>

2
app/views/settings/payment_method_settings/index.html.erb
View File

@@ -34,7 +34,7 @@
<td><%= settings_payment_method_setting.auth_token %></td>
<td><%= settings_payment_method_setting.merchant_account_id %></td>
<td><%= link_to 'Edit', edit_settings_payment_method_setting_path(settings_payment_method_setting) %>
| <%= link_to 'Destroy', settings_payment_method_settings_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
| <%= link_to 'Destroy', settings_payment_method_setting_path(settings_payment_method_setting), method: :delete, data: { confirm: 'Are you sure?' } %></td>
</tr>
<% end %>
</tbody>

15
app/views/settings/processing_items/_form.html.erb
View File

@@ -20,9 +20,18 @@
</div>
<ul class="opi_ul" id="menu_items_category_<%= category.id %>">
<% category.menu_items.each do |item| %>
<li><div class="processitems opi_default" data-id="<%= item.item_code %>"><%= item.name %></div></li>
<% flag = false %>
<% itemsary = JSON.parse(@settings_order_queue_station.processing_items) %>
<% itemsary.each do |item_code| %>
<% if item_code == item.item_code %>
<% flag = true %>
<% end %>
<% end %>
<% if flag == true %>
<li><div class="processitems opi_default opi_selected" data-id="<%= item.item_code %>"><%= item.name %></div></li>
<% else %>
<li><div class="processitems opi_default" data-id="<%= item.item_code %>"><%= item.name %></div></li>
<% end %>
<% end %>
</ul>
</div>

1
app/views/settings/set_menu_items/_form.html.erb
View File

@@ -6,6 +6,7 @@
<%= f.input :name %>
<%= f.input :alt_name %>
<%= f.input :type %>
<%= f.input :account_id, :label => "Account type", :collection => Account.collection %>
<%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %>
<%= f.input :min_qty %>

2
app/views/settings/set_menu_items/show.html.erb
View File

@@ -19,6 +19,7 @@
<th>Name</th>
<th>Alt name</th>
<th>Type</th>
<th>Account Type</th>
<th>Menu category</th>
<th>Menu item</th>
<th>Min qty</th>
@@ -35,6 +36,7 @@
<td><%= @settings_menu_item.name rescue "-" %></td>
<td><%= @settings_menu_item.alt_name %></td>
<td><%= @settings_menu_item.type %></td>
<td><%= @settings_menu_item.account.title %></td>
<td><%= @settings_menu_item.menu_category_id %></td>
<td><%= @settings_menu_item.menu_item_id %></td>
<td><%= @settings_menu_item.min_qty %></td>

1
app/views/settings/simple_menu_items/_form.html.erb
View File

@@ -6,6 +6,7 @@
<%= f.input :name %>
<%= f.input :alt_name %>
<%= f.input :type %>
<%= f.input :account_id, :label => "Account type", :collection => Account.collection %>
<%= f.input :menu_item_id, :label => "Parent Menu Item", :collection => MenuItem.collection %>
<%= f.input :min_qty %>
<%= f.input :min_selectable_item %>

2
app/views/settings/simple_menu_items/show.html.erb
View File

@@ -21,6 +21,7 @@
<th>Name</th>
<th>Alt name</th>
<th>Type</th>
<th>Accout</th>
<th>Menu category</th>
<th>Menu item</th>
<th>Min qty</th>
@@ -37,6 +38,7 @@
<td><%= @settings_menu_item.name rescue "-" %></td>
<td><%= @settings_menu_item.alt_name %></td>
<td><%= @settings_menu_item.type %></td>
<td><%= @settings_menu_item.account.title %></td>
<td><%= @settings_menu_item.menu_category_id %></td>
<td><%= @settings_menu_item.menu_item_id %></td>
<td><%= @settings_menu_item.min_qty %></td>