From b00b9fc75c20e5f52eaa1de726cd9808bdeb3497 Mon Sep 17 00:00:00 2001 From: Myat Zin Wai Maw Date: Tue, 3 Sep 2019 17:33:27 +0630 Subject: [PATCH] sync receipt --- app/models/assigned_order_item.rb | 4 +++- app/models/booking.rb | 4 +++- app/models/order.rb | 4 +++- app/models/order_item.rb | 4 +++- app/models/printer/printer_worker.rb | 26 +++++++++++++------------- app/models/sale.rb | 4 +++- app/models/sale_audit.rb | 4 +++- app/models/sale_item.rb | 4 +++- app/models/sale_order.rb | 6 ++++-- app/models/sale_payment.rb | 4 +++- app/models/sale_tax.rb | 4 +++- 11 files changed, 44 insertions(+), 24 deletions(-) diff --git a/app/models/assigned_order_item.rb b/app/models/assigned_order_item.rb index 9359fd66..c1b0162e 100755 --- a/app/models/assigned_order_item.rb +++ b/app/models/assigned_order_item.rb @@ -64,6 +64,8 @@ class AssignedOrderItem < ApplicationRecord private def generate_custom_id - self.assigned_order_item_id = SeedGenerator.generate_id(self.class.name, "AOI") + if self.assigned_order_item_id.nil? + self.assigned_order_item_id = SeedGenerator.generate_id(self.class.name, "AOI") + end end end diff --git a/app/models/booking.rb b/app/models/booking.rb index 374dd0cf..e4afb8c7 100755 --- a/app/models/booking.rb +++ b/app/models/booking.rb @@ -122,6 +122,8 @@ class Booking < ApplicationRecord private def generate_custom_id - self.booking_id = SeedGenerator.generate_id(self.class.name, "BKI") + if self.booking_id.nil? + self.booking_id = SeedGenerator.generate_id(self.class.name, "BKI") + end end end diff --git a/app/models/order.rb b/app/models/order.rb index 26451207..f53eb7e8 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -557,7 +557,9 @@ class Order < ApplicationRecord private def generate_custom_id - self.order_id = SeedGenerator.generate_id(self.class.name, "ODR") + if self.order_id.nil? + self.order_id = SeedGenerator.generate_id(self.class.name, "ODR") + end end def set_order_date diff --git a/app/models/order_item.rb b/app/models/order_item.rb index c5d715f3..0ac03e9b 100755 --- a/app/models/order_item.rb +++ b/app/models/order_item.rb @@ -97,6 +97,8 @@ class OrderItem < ApplicationRecord private def generate_custom_id - self.order_items_id = SeedGenerator.generate_id(self.class.name, "ODI") + if self.order_items_id.nil? + self.order_items_id = SeedGenerator.generate_id(self.class.name, "ODI") + end end end diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb index 8bbf1c6d..fee19a31 100755 --- a/app/models/printer/printer_worker.rb +++ b/app/models/printer/printer_worker.rb @@ -38,20 +38,20 @@ class Printer::PrinterWorker end def print(file_path,printer_destination = nil ) - # if printer_destination.nil? - # printer_destination = self.printer_destination - # end + if printer_destination.nil? + printer_destination = self.printer_destination + end - # puts printer_destination - # puts '........Printer Destination..........' + puts printer_destination + puts '........Printer Destination..........' - # copy = self.print_copies - # #Print only when printer information is not null - # if !self.printer_destination.nil? - # (1..copy).each do - # page = Cups::PrintJob.new(file_path, printer_destination) - # page.print - # end - # end + copy = self.print_copies + #Print only when printer information is not null + if !self.printer_destination.nil? + (1..copy).each do + page = Cups::PrintJob.new(file_path, printer_destination) + page.print + end + end end end diff --git a/app/models/sale.rb b/app/models/sale.rb index 56377de5..8f5c7eb0 100644 --- a/app/models/sale.rb +++ b/app/models/sale.rb @@ -2951,6 +2951,8 @@ end private def generate_custom_id - self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") + if self.sale_id.nil? + self.sale_id = SeedGenerator.generate_id(self.class.name, "SAL") + end end end diff --git a/app/models/sale_audit.rb b/app/models/sale_audit.rb index 36734ec1..d96034ad 100755 --- a/app/models/sale_audit.rb +++ b/app/models/sale_audit.rb @@ -176,6 +176,8 @@ class SaleAudit < ApplicationRecord private def generate_custom_id - self.sale_audit_id = SeedGenerator.generate_id(self.class.name, "SAI") + if self.sale_audit_id.nil? + self.sale_audit_id = SeedGenerator.generate_id(self.class.name, "SAI") + end end end diff --git a/app/models/sale_item.rb b/app/models/sale_item.rb index d8be28b7..b8ada0ed 100755 --- a/app/models/sale_item.rb +++ b/app/models/sale_item.rb @@ -223,6 +223,8 @@ class SaleItem < ApplicationRecord private def generate_custom_id - self.sale_item_id = SeedGenerator.generate_id(self.class.name, "SLI") + if self.sale_item_id.nil? + self.sale_item_id = SeedGenerator.generate_id(self.class.name, "SLI") + end end end diff --git a/app/models/sale_order.rb b/app/models/sale_order.rb index ab50e228..bbd68829 100755 --- a/app/models/sale_order.rb +++ b/app/models/sale_order.rb @@ -34,7 +34,9 @@ class SaleOrder < ApplicationRecord private def generate_sale_order_id # self.class.name - saleOrderId = SeedGenerator.generate_id(self.class.name, 'SOI') - self.sale_order_id = saleOrderId + if self.sale_order_id.nil? + self.sale_order_id = SeedGenerator.generate_id(self.class.name, 'SOI') + end + end end diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index 4808860a..7050eb25 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -1065,6 +1065,8 @@ class SalePayment < ApplicationRecord private def generate_custom_id - self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") + if self.sale_payment_id.nil? + self.sale_payment_id = SeedGenerator.generate_id(self.class.name, "SPI") + end end end diff --git a/app/models/sale_tax.rb b/app/models/sale_tax.rb index bd89ec1b..06c73253 100755 --- a/app/models/sale_tax.rb +++ b/app/models/sale_tax.rb @@ -34,6 +34,8 @@ class SaleTax < ApplicationRecord private def generate_custom_id - self.sale_tax_id = SeedGenerator.generate_id(self.class.name, "STI") + if self.sale_tax_id.nil? + self.sale_tax_id = SeedGenerator.generate_id(self.class.name, "STI") + end end end