diff --git a/.gitignore b/.gitignore index 91a498bc..5dafee53 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,6 @@ config/deploy/config/* # For Redis Server log file dump.rdb + +# Fonts +public/fonts/* diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 03ed4d21..b71944e3 100644 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -4,7 +4,7 @@ class OrderItemPdf < Prawn::Document def initialize(print_settings,order_item, print_status, options, alt_name) self.page_width = 180 self.page_height = 1450 - self.margin = 5 + self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 30 self.total_width = 40 # No Need for item diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 9ee459c8..c1762b17 100644 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -4,7 +4,7 @@ class OrderSummaryPdf < Prawn::Document def initialize(print_settings,order, print_status, order_items = nil,alt_name) self.page_width = 180 self.page_height = 1450 - self.margin = 5 + self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 30 self.total_width = 40 # No Need for item diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb index 86738c22..77bda01b 100644 --- a/app/views/origami/payments/show.html.erb +++ b/app/views/origami/payments/show.html.erb @@ -320,6 +320,9 @@ $(document).on('click', '.cashier_number', function(event){ }); $( document ).ready(function() { + // Disable click event cash to prevent + $(".payment .cash-color").off('click'); + $('#credit_payment').click(function() { var sale_id = $('#sale_id').text(); window.location.href = '/origami/sale/'+ sale_id + "/payment/credit_payment" diff --git a/dump.rdb b/dump.rdb index aca182bf..3ac76616 100644 Binary files a/dump.rdb and b/dump.rdb differ diff --git a/lib/tasks/clear_data.rake b/lib/tasks/clear_data.rake index affe76ff..d0bf6ceb 100644 --- a/lib/tasks/clear_data.rake +++ b/lib/tasks/clear_data.rake @@ -1,19 +1,19 @@ namespace :clear do - desc "Clear Data" - task :data => :environment do - BookingOrder.delete_all - Booking.delete_all - OrderItem.delete_all - AssignedOrderItem.delete_all - Order.delete_all - SaleOrder.delete_all - SaleItem.delete_all - Sale.delete_all - SaleAudit.delete_all - SalePayment.delete_all - ShiftSale.delete_all - PaymentJournal.delete_all - DiningFacility.update_all(status:'available') - puts "Clear Data Done." - end + # desc "Clear Data" + # task :data => :environment do + # BookingOrder.delete_all + # Booking.delete_all + # OrderItem.delete_all + # AssignedOrderItem.delete_all + # Order.delete_all + # SaleOrder.delete_all + # SaleItem.delete_all + # Sale.delete_all + # SaleAudit.delete_all + # SalePayment.delete_all + # ShiftSale.delete_all + # PaymentJournal.delete_all + # DiningFacility.update_all(status:'available') + # puts "Clear Data Done." + # end end