From c4ab456176766bcaa6ec578461cfbc3462b52783 Mon Sep 17 00:00:00 2001 From: phyusin Date: Wed, 11 Jul 2018 18:32:09 +0630 Subject: [PATCH] credit payment for quick service --- app/assets/javascripts/origami.js | 20 +- .../origami/credit_sales_controller.rb | 2 +- app/controllers/origami/home_controller.rb | 4 +- .../origami/payments_controller.rb | 7 +- .../origami/pending_order_controller.rb | 46 ++- app/controllers/origami/rooms_controller.rb | 4 +- app/controllers/origami/sales_controller.rb | 2 +- app/models/sale.rb | 4 +- app/models/sale_payment.rb | 36 ++- app/pdf/receipt_bill_a5_pdf.rb | 30 +- app/pdf/receipt_bill_pdf.rb | 31 +- app/views/origami/credit_sales/show.html.erb | 12 +- app/views/origami/home/index.html.erb | 8 +- app/views/origami/home/show.html.erb | 8 +- app/views/origami/orders/show.html.erb | 8 +- app/views/origami/payments/show.html.erb | 4 - .../pending_order/completed_sale.html.erb | 53 ++++ .../pending_order/credit_sale.html.erb | 274 ++++++++++++++++++ .../origami/pending_order/index.html.erb | 138 ++++++--- app/views/origami/pending_order/show.html.erb | 51 ++++ app/views/origami/rooms/show.html.erb | 8 +- app/views/origami/sales/show.html.erb | 8 +- config/routes.rb | 27 +- 23 files changed, 666 insertions(+), 119 deletions(-) create mode 100644 app/views/origami/pending_order/credit_sale.html.erb diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js index 9db79038..00ede7ab 100755 --- a/app/assets/javascripts/origami.js +++ b/app/assets/javascripts/origami.js @@ -229,7 +229,12 @@ $(document).on('turbolinks:load', function() { $(document).on("click", ".credit_detail",function(){ var sale_id = $(this).attr("data-id"); - window.location.href = "/origami/cashier/credit_sales/"+sale_id; + var cashier_type = $(this).attr("data-type"); + if(cashier_type=='cashier'){ + window.location.href = "/origami/cashier/credit_sales/"+sale_id; + }else{ + window.location.href = "/origami/quick_service/credit_sales/"+sale_id; + } }); }); @@ -523,7 +528,7 @@ function timeFormat(date){ return time; } -function getCreditData(){ +function getCreditData(cashier_type){ var filter = $("#filter").val(); var customer = $("#sel_customer").val(); @@ -535,11 +540,11 @@ function getCreditData(){ if((customer!=undefined) && (customer!=null) && (customer!="")){ customer_id = customer; } - getCreditSales(receipt_no, customer_id); + getCreditSales(receipt_no, customer_id, cashier_type); } -function getCreditSales(filter, customer){ - $(".credit_items").hide(); +function getCreditSales(filter, customer, cashier_type){ + // $(".credit_items").hide(); $(".tbd_credit_lists").empty(); var html_credit_items = $("#html_credit_items").html(); var receipt_no = ""; @@ -554,7 +559,7 @@ function getCreditSales(filter, customer){ type: "POST", data: {receipt_no: receipt_no, customer_id: customer_id}, dataType: 'json', - url: "/origami/cashier/credit_sales", + url: "/origami/"+cashier_type+"/credit_sales", success: function(data){ // console.log(data); if(data.status){ @@ -572,7 +577,8 @@ function getCreditSales(filter, customer){ 'receipt_no':credit_sales[i].receipt_no, 'cashier_name':credit_sales[i].cashier_name, 'customer_name':credit_sales[i].customer_name, - 'credit_amount':credit_sales[i].payment_amount + 'credit_amount':credit_sales[i].payment_amount, + 'cashier_type':cashier_type })); } } diff --git a/app/controllers/origami/credit_sales_controller.rb b/app/controllers/origami/credit_sales_controller.rb index 8a836e96..8f43edda 100644 --- a/app/controllers/origami/credit_sales_controller.rb +++ b/app/controllers/origami/credit_sales_controller.rb @@ -1,6 +1,6 @@ class Origami::CreditSalesController < BaseOrigamiController def show - @cashier_type = params[:type] + @cashier_type = 'cashier' @webview = false if check_mobile @webview = true diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb index 46c3ddf8..837f0c04 100755 --- a/app/controllers/origami/home_controller.rb +++ b/app/controllers/origami/home_controller.rb @@ -6,7 +6,7 @@ class Origami::HomeController < BaseOrigamiController @webview = check_mobile @tables = Table.unscoped.all.active.order('status desc') @rooms = Room.unscoped.all.active.order('status desc') - @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) + @complete = Sale.completed_sale("cashier") @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @customers = Customer.pluck("customer_id, name") @@ -20,7 +20,7 @@ class Origami::HomeController < BaseOrigamiController @tables = Table.unscoped.all.active.order('status desc') @rooms = Room.unscoped.all.active.order('status desc') - @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) + @complete = Sale.completed_sale("cashier") @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @customers = Customer.pluck("customer_id, name") diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 215a0cfd..f75da8d0 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -235,8 +235,7 @@ class Origami::PaymentsController < BaseOrigamiController sale_id = params[:sale_id] @cashier_type = params[:type] if path.include? ("credit_payment") - @sale_payment = SalePayment.select("SUM(payment_amount) as payment_amount") - .where("sale_id = ? and payment_method=?", sale_id, "creditnote") + @sale_payment = SalePayment.get_credit_total_left(sale_id) end @member_discount = MembershipSetting.find_by_discount(1) @@ -371,11 +370,11 @@ class Origami::PaymentsController < BaseOrigamiController if path.include? ("credit_payment") @sale_payment_data = SalePayment.get_sale_payment_for_credit(@sale_data) else - @sale_payment_data = @sale_data.sale_payments + @sale_payment_data = SalePayment.get_sale_payments(@sale_data) end @sale_payment_data.each do |spay| if spay.payment_method == "cash" - @cash = spay.payment_amount + @cash += spay.payment_amount end if spay.payment_method !="creditnote" @other_payment += spay.payment_amount diff --git a/app/controllers/origami/pending_order_controller.rb b/app/controllers/origami/pending_order_controller.rb index d6230993..594e4b7c 100644 --- a/app/controllers/origami/pending_order_controller.rb +++ b/app/controllers/origami/pending_order_controller.rb @@ -4,12 +4,14 @@ class Origami::PendingOrderController < BaseOrigamiController # @order = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status = 'billed' and source = 'quick_service'",DateTime.now.strftime('%Y-%m-%d')) @sale = Sale.pending_sale @order = Sale.pending_order - @completed = Sale.completed_sale + @completed = Sale.completed_sale("quick_service") + @customers = Customer.pluck("customer_id, name") end def show @sales = Sale.pending_sale @orders = Sale.pending_order - @completed = Sale.completed_sale + @completed = Sale.completed_sale("quick_service") + @customers = Customer.pluck("customer_id, name") @id = params[:sale_id] if(@id[0,3] == "SAL") @sale = Sale.find(@id) @@ -32,7 +34,7 @@ class Origami::PendingOrderController < BaseOrigamiController end end end - puts @status + # puts @status if @bookings.dining_facility_id.to_i > 0 @table_id = Booking.find(@bookings.booking_id).dining_facility_id @dining = DiningFacility.find(@table_id) @@ -40,13 +42,14 @@ class Origami::PendingOrderController < BaseOrigamiController @table_id = nil @dining = nil end - + @customers = Customer.pluck("customer_id, name") end def completed_sale @sales = Sale.pending_sale @orders = Sale.pending_order - @completed = Sale.completed_sale + @completed = Sale.completed_sale("quick_service") + @customers = Customer.pluck("customer_id, name") @id = params[:sale_id] @sale = Sale.find(@id) @@ -71,4 +74,37 @@ class Origami::PendingOrderController < BaseOrigamiController render "origami/cash_outs/new" end + def credit_sale + @sales = Sale.pending_sale + @orders = Sale.pending_order + @completed = Sale.completed_sale("quick_service") + @id = params[:sale_id] + @customers = Customer.pluck("customer_id, name") + + @sale = Sale.find_by_sale_id(params[:sale_id]) + @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id + @booking = BookingOrder.find_by_order_id(@order).booking_id + @bookings = Booking.find(@booking) + @status = "sale" + + if @bookings.dining_facility_id.to_i > 0 + @table_id = Booking.find(@bookings.booking_id).dining_facility_id + @dining = DiningFacility.find(@table_id) + else + @table_id = nil + @dining = nil + end + + @sale_payment = SalePayment.select("SUM(payment_amount) as payment_amount") + .where("sale_id = ? and payment_method=?", @sale.sale_id, "creditnote") + + @sale_taxes = [] + sale_taxes = SaleTax.where("sale_id = ?", @sale.sale_id) + if !sale_taxes.empty? + sale_taxes.each do |sale_tax| + @sale_taxes.push(sale_tax) + end + end + end + end diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb index 46b3af30..fe571c4e 100755 --- a/app/controllers/origami/rooms_controller.rb +++ b/app/controllers/origami/rooms_controller.rb @@ -2,7 +2,7 @@ class Origami::RoomsController < BaseOrigamiController def index @tables = Table.unscoped.all.active.order('status desc') @rooms = Room.unscoped.all.active.order('status desc') - @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) + @complete = Sale.completed_sale("cashier") @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') # @shift = ShiftSale.current_open_shift(current_user.id) @webview = false @@ -19,7 +19,7 @@ class Origami::RoomsController < BaseOrigamiController @tables = Table.unscoped.all.active.order('status desc') @rooms = Room.unscoped.all.active.order('status desc') - @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) + @complete = Sale.completed_sale("cashier") @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @customers = Customer.pluck("customer_id, name") @room = DiningFacility.find(params[:room_id]) diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb index 9cb28815..a33f6c91 100755 --- a/app/controllers/origami/sales_controller.rb +++ b/app/controllers/origami/sales_controller.rb @@ -7,7 +7,7 @@ class Origami::SalesController < BaseOrigamiController @tables = Table.unscoped.all.active.order('status desc') @rooms = Room.unscoped.all.active.order('status desc') - @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d')) + @complete = Sale.completed_sale("cashier") @orders = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc') @customers = Customer.pluck("customer_id, name") @sale = Sale.find(params[:sale_id]) diff --git a/app/models/sale.rb b/app/models/sale.rb index 3a0035df..25b11e11 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -2552,11 +2552,11 @@ end query = query.where("bookings.booking_status = 'assign' AND orders.status = 'new' AND orders.source =? ","quick_service") .group("bookings.booking_id") end - def self.completed_sale + def self.completed_sale(type) query = Sale.all query = query.joins("join sale_orders as sale_orders on sale_orders.sale_id = sales.sale_id") .joins("join orders as orders on orders.order_id = sale_orders.order_id") - query = query.where("sales.sale_status != 'new' AND orders.status = 'billed' AND orders.source =? ","quick_service") + query = query.where("sales.sale_status != 'new' AND orders.status = 'billed' AND orders.source =? ","#{type}") query = query.where("DATE_FORMAT(sales.created_at,'%Y-%m-%d') = ? ",DateTime.now.strftime('%Y-%m-%d')) .group("sales.sale_id") end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index b6133e82..170b4ce2 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -16,7 +16,7 @@ class SalePayment < ApplicationRecord #get all payment for this invoices if payment_for invoice_sale_payments = SalePayment.get_sale_payment_for_credit(invoice) - amount_due = get_credit_total_left[0] ? get_credit_total_left[0].payment_amount.to_f : 0 + amount_due = SalePayment.get_credit_total_left(self.sale_id)[0] ? SalePayment.get_credit_total_left(self.sale_id)[0].payment_amount.to_f : 0 else invoice_sale_payments = invoice.sale_payments amount_due = invoice.grand_total @@ -314,7 +314,7 @@ class SalePayment < ApplicationRecord if !payment_for self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f else - credit_sale_payment = get_credit_total_left[0] ? get_credit_total_left[0].payment_amount.to_f : 0 ###need to calculate creditnote total in here + credit_sale_payment = SalePayment.get_credit_total_left(self.sale_id)[0] ? SalePayment.get_credit_total_left(self.sale_id)[0].payment_amount.to_f : 0 ###need to calculate creditnote total in here self.outstanding_amount = credit_sale_payment - self.received_amount.to_f end self.payment_status = "paid" @@ -370,7 +370,7 @@ class SalePayment < ApplicationRecord if !payment_for self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f else - credit_payment = get_credit_total_left ###need to calculate creditnote total in here + credit_payment = SalePayment.get_credit_total_left(self.sale_id) ###need to calculate creditnote total in here self.outstanding_amount = credit_payment[0].payment_amount.to_f - self.received_amount.to_f end self.payment_status = "paid" @@ -860,18 +860,20 @@ class SalePayment < ApplicationRecord s.cashier_name as cashier_name, c.name as customer_name") .joins("INNER JOIN sales s ON s.sale_id = sale_payments.sale_id") .joins("INNER JOIN customers c ON c.customer_id = s.customer_id") - .where("(CASE WHEN (s.grand_total + s.amount_changed)=(select SUM(payment_amount) FROM sale_payments WHERE sale_id=s.sale_id AND payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' END) and s.sale_status = 'completed' #{receipt_no} #{customer}") + .joins("INNER JOIN sale_orders so ON so.sale_id = s.sale_id") + .joins("INNER JOIN orders o ON o.order_id = so.order_id") + .where("(CASE WHEN (s.grand_total + s.amount_changed)=(select SUM(payment_amount) FROM sale_payments WHERE sale_id=s.sale_id AND payment_method!='creditnote') THEN NULL ELSE payment_method='creditnote' END) and s.sale_status = 'completed' and o.source='#{params[:type]}' #{receipt_no} #{customer}") .group("s.receipt_no") .order("s.receipt_date ASC, s.receipt_no ASC") return query end - def get_credit_total_left + def self.get_credit_total_left(sale_id) query = SalePayment.select("(SUM(sale_payments.payment_amount) - (CASE WHEN SUBSTRING_INDEX(sa.remark,'||',1)=sale_payments.sale_payment_id THEN SUM(sale_payments.payment_amount) ELSE 0 END)) as payment_amount") .joins(" LEFT JOIN sale_audits sa on SUBSTRING_INDEX(sa.remark,'||',1)=sale_payments.sale_payment_id") - .where("sale_payments.payment_method = 'creditnote' AND sale_payments.sale_id = '#{self.sale_id}'") + .where("sale_payments.payment_method = 'creditnote' AND sale_payments.sale_id = '#{sale_id}'") .group("sale_payments.sale_id") return query end @@ -880,9 +882,8 @@ class SalePayment < ApplicationRecord query = sale_data.sale_payments .joins(" JOIN sale_audits sa on SUBSTRING_INDEX(sa.remark,'||',1)=sale_payments.sale_payment_id") .where("sa.action='SALEPAYMENT' AND sa.remark IS NOT NULL - AND sale_payments.payment_method!='cash' AND DATE_FORMAT(sale_payments.created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(sale_payments.created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' - ") + ") #AND sale_payments.payment_method!='cash' .group("sale_payments.sale_payment_id") return query end @@ -899,6 +900,25 @@ class SalePayment < ApplicationRecord return query end + def self.get_sale_payments(sale_data) + query = sale_data.sale_payments + .where("CASE WHEN ((SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}') - + (SELECT CASE WHEN s.amount_changed > 0 and (s.amount_received - s.amount_changed) = s.grand_total THEN ( SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}') + ELSE SUM(payment_amount) END + FROM sale_payments + JOIN sales s ON s.sale_id=sale_payments.sale_id + JOIN sale_audits sa + ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payment_id + where sa.sale_id='#{sale_data.sale_id}')) = 0 + THEN payment_method!='creditnote' ELSE 1 END") + .group("sale_payments.sale_payment_id") + return query + end + private def generate_custom_id self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb index f6555bcb..49ba7530 100644 --- a/app/pdf/receipt_bill_a5_pdf.rb +++ b/app/pdf/receipt_bill_a5_pdf.rb @@ -371,7 +371,21 @@ class ReceiptBillA5Pdf < Prawn::Document def sale_payment(sale_data,precision,delimiter) stroke_horizontal_rule # move_down 10 - sale_payments = SalePayment.select("SUM(sale_payments.payment_amount) as payment_amount,sale_payments.payment_method").where('sale_id = ?', sale_data.sale_id).group("payment_method") + sale_payments = SalePayment.select("SUM(sale_payments.payment_amount) as payment_amount,sale_payments.payment_method") + .where("(CASE WHEN ((SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}') - + (SELECT CASE WHEN s.amount_changed > 0 and (s.amount_received - s.amount_changed) = s.grand_total THEN ( SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}') + ELSE SUM(payment_amount) END + FROM sale_payments + JOIN sales s ON s.sale_id=sale_payments.sale_id + JOIN sale_audits sa + ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payment_id + where sa.sale_id='#{sale_data.sale_id}')) = 0 + THEN payment_method!='creditnote' ELSE 1 END) AND sale_id = ?", sale_data.sale_id) + .group("payment_method") sale_payments.each do |payment| y_position = cursor if payment.payment_method == "paypar" @@ -573,7 +587,19 @@ class ReceiptBillA5Pdf < Prawn::Document end def sign(sale_data) - SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment| + SalePayment.where("(CASE WHEN ((SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}') - + (SELECT CASE WHEN s.amount_changed > 0 and (s.amount_received - s.amount_changed) = s.grand_total THEN ( SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}') + ELSE SUM(payment_amount) END + FROM sale_payments + JOIN sales s ON s.sale_id=sale_payments.sale_id + JOIN sale_audits sa + ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payment_id + where sa.sale_id='#{sale_data.sale_id}')) = 0 + THEN payment_method!='creditnote' ELSE 1 END) AND sale_id = ?", sale_data.sale_id).each do |payment| if payment.payment_method == "creditnote" y_position = cursor diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index 80a57c51..f352f967 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -369,7 +369,22 @@ class ReceiptBillPdf < Prawn::Document def sale_payment(sale_data,precision,delimiter) stroke_horizontal_rule #move_down line_move - sale_payments = SalePayment.select("SUM(sale_payments.payment_amount) as payment_amount,sale_payments.payment_method").where('sale_id = ?', sale_data.sale_id).group("payment_method") + sale_payments = SalePayment.select("SUM(sale_payments.payment_amount) as payment_amount,sale_payments.payment_method") + .where("(CASE WHEN ((SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}') - + (SELECT CASE WHEN s.amount_changed > 0 and (s.amount_received - s.amount_changed) = s.grand_total THEN ( SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}') + ELSE SUM(payment_amount) END + FROM sale_payments + JOIN sales s ON s.sale_id=sale_payments.sale_id + JOIN sale_audits sa + ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payment_id + where sa.sale_id='#{sale_data.sale_id}')) = 0 + THEN payment_method!='creditnote' ELSE 1 END) AND sale_id = ?", sale_data.sale_id) + .group("payment_method") + sale_payments.each do |payment| y_position = cursor if payment.payment_method == "paypar" @@ -573,7 +588,19 @@ class ReceiptBillPdf < Prawn::Document end def sign(sale_data) - SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment| + SalePayment.where("(CASE WHEN ((SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}') - + (SELECT CASE WHEN s.amount_changed > 0 and (s.amount_received - s.amount_changed) = s.grand_total THEN ( SELECT SUM(payment_amount) + FROM sale_payments where payment_method='creditnote' + and sale_id='#{sale_data.sale_id}') + ELSE SUM(payment_amount) END + FROM sale_payments + JOIN sales s ON s.sale_id=sale_payments.sale_id + JOIN sale_audits sa + ON SUBSTRING_INDEX(sa.remark,'||',1)=sale_payment_id + where sa.sale_id='#{sale_data.sale_id}')) = 0 + THEN payment_method!='creditnote' ELSE 1 END) AND sale_id = ?", sale_data.sale_id).each do |payment| if payment.payment_method == "creditnote" y_position = cursor diff --git a/app/views/origami/credit_sales/show.html.erb b/app/views/origami/credit_sales/show.html.erb index da5831fb..c286fb65 100755 --- a/app/views/origami/credit_sales/show.html.erb +++ b/app/views/origami/credit_sales/show.html.erb @@ -163,10 +163,10 @@
- +
- <% if !@customers.empty? %> <% @customers.each do |cus| %> @@ -288,10 +288,12 @@ Grand Total: <%= @sale.grand_total rescue 0%> + <%if !@sale_payment.nil? %> Credit Amount: <%= @sale_payment[0].payment_amount rescue 0%> + <% end %>
@@ -302,14 +304,16 @@
+ <% if current_user.role != "waiter" %> + <% end %>
+ + + + + diff --git a/app/views/origami/pending_order/index.html.erb b/app/views/origami/pending_order/index.html.erb index 673dd8e2..f785449f 100644 --- a/app/views/origami/pending_order/index.html.erb +++ b/app/views/origami/pending_order/index.html.erb @@ -10,6 +10,9 @@
  • Pending
    • +
  • + <%= t :credits %> +
    • @@ -44,6 +47,40 @@ <% end %>
    + + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + + + + + + + + + +
    <%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %><%= t("views.right_panel.detail.receipt_no") %> <%= t :cashier %> <%= t("views.right_panel.detail.name") %> <%= t :customer %> <%= t("views.right_panel.detail.name") %> <%= t("views.right_panel.detail.credit_amount") %>
    +
    +
    +
    + @@ -61,47 +98,64 @@ - + + + diff --git a/app/views/origami/pending_order/show.html.erb b/app/views/origami/pending_order/show.html.erb index 2559c179..9658f1c5 100644 --- a/app/views/origami/pending_order/show.html.erb +++ b/app/views/origami/pending_order/show.html.erb @@ -9,6 +9,9 @@
  • Pending
    • +
  • + <%= t :credits %> +
    • @@ -42,6 +45,40 @@ <% end %>
    + + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    + + + + + + + + + +
    <%= t :credit %> <%= t :sale %> <%= t("views.right_panel.detail.date") %><%= t("views.right_panel.detail.receipt_no") %> <%= t :cashier %> <%= t("views.right_panel.detail.name") %> <%= t :customer %> <%= t("views.right_panel.detail.name") %> <%= t("views.right_panel.detail.credit_amount") %>
    +
    +
    +
    + @@ -194,9 +231,23 @@ + + + +