diff --git a/README.md b/README.md index bbbd539a..25086cce 100755 --- a/README.md +++ b/README.md @@ -42,6 +42,8 @@ For Extra Time For Order Item & Order Summary Slim *** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf 1) settings/print_settings + (a) Font is present => {Header font size:11, Item Font Size:9} + (b) Font is blank => {Header font size:12, Item Font Size:10} 2) settings/lookups => { type:print_settings, name:OrderSlimPdf, value:1 } * no need to change these files { app/controllers/oqs/edit_controller.rb @@ -53,7 +55,7 @@ For Order Item & Order Summary Slim For ReceiptBillA5Pdf *** change ReceiptBillPdf to ReceiptBillA5Pdf - 1) settings/print_settings , width:680, height:1450 + 1) settings/print_settings , width:680, height:1450, Header font Size:16, Item font size:14 2) settings/lookups => { type:print_settings, name:ReceiptBillA5Pdf, value:1 } For ReceiptBillAltName options @@ -62,6 +64,9 @@ For ReceiptBillAltName options For OrderSetPdf options *** change OrderItemPdf to OrderSetItemPdf and OrderSummaryPdf to OrderSummarySetPdf 1) settings/lookups => { type:print_settings, name:OrderSetPdf, value:1 } + 2) settings/print_settings + (a) Font is present => {Header font size:11, Item Font Size:9} + (b) Font is blank => {Header font size:12, Item Font Size:10} For Bank Integration setting 1) rake db:migrate for card_sale_trans, card_settle_trans diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/login.scss index ed0b36f9..a1058d25 100755 --- a/app/assets/stylesheets/login.scss +++ b/app/assets/stylesheets/login.scss @@ -101,3 +101,11 @@ font-size: 111px; padding : 20px 0 20px 0; } + +/* Shop Name in Login Page */ +.current-shop-name{ + color : #FFFFFF; + font-size: 21px; + font-weight: bold; + margin : 0 0 20px 0; +} \ No newline at end of file diff --git a/app/controllers/api/survey_controller.rb b/app/controllers/api/survey_controller.rb index 23f9c699..04480864 100644 --- a/app/controllers/api/survey_controller.rb +++ b/app/controllers/api/survey_controller.rb @@ -1,4 +1,5 @@ class Api::SurveyController < Api::ApiController + # before_action :authenticate def index diff --git a/app/controllers/origami/dinga_controller.rb b/app/controllers/origami/dinga_controller.rb index 9126556a..b98b3408 100644 --- a/app/controllers/origami/dinga_controller.rb +++ b/app/controllers/origami/dinga_controller.rb @@ -1,5 +1,5 @@ class Origami::DingaController < BaseOrigamiController - def index + def index @sale_id = params[:sale_id] payment_method = params[:payment_method] @cashier_type = params[:type] @@ -15,16 +15,16 @@ class Origami::DingaController < BaseOrigamiController # @rounding_adj = new_total-sale_data.grand_total @rounding_adj = sale_data.rounding_adjustment - @payparcount = 0 + @dingacount = 0 others = 0 sale_data.sale_payments.each do |sale_payment| - if sale_payment.payment_method == "paypar" - @payparcount = @payparcount + sale_payment.payment_amount + if sale_payment.payment_method == "dinga" + @dingacount = @dingacount + sale_payment.payment_amount else others = others + sale_payment.payment_amount end end - @payment_prices = sale_data.grand_total - @payparcount -others + @redeem_prices = sale_data.grand_total - @dingacount -others if sale_data @@ -33,15 +33,15 @@ class Origami::DingaController < BaseOrigamiController if customer_data @membership_id = customer_data.membership_id if !@membership_id.nil? - membership_setting = MembershipSetting.find_by_membership_type("paypar_url") + membership_setting = MembershipSetting.find_by_membership_type("dinga_url") if membership_setting.gateway_url member_actions =MembershipAction.find_by_membership_type("get_account_balance") if member_actions.gateway_url - @campaign_type_id = nil + @campaign_type_id = member_actions.additional_parameter["campaign_type_id"] url = membership_setting.gateway_url.to_s + member_actions.gateway_url.to_s merchant_uid= member_actions.merchant_account_id auth_token = member_actions.auth_token.to_s - membership_data = SalePayment.get_paypar_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token) + membership_data = SalePayment.get_dinga_account(url,membership_setting.auth_token,@membership_id,@campaign_type_id,merchant_uid,auth_token) if membership_data["status"]==true @membership_rebate_balance=membership_data["balance"] @out = true, @membership_rebate_balance,@membership_id @@ -67,36 +67,36 @@ class Origami::DingaController < BaseOrigamiController @out = false, 0 end @out = false, 0 - end - - def create - cash = params[:payment_amount] - sale_id = params[:sale_id] - if(Sale.exists?(sale_id)) - saleObj = Sale.find(sale_id) - shop_details = Shop::ShopDetail - - # rounding adjustment - # if shop_details.is_rounding_adj - # new_total = Sale.get_rounding_adjustment(saleObj.grand_total) - # rounding_adj = new_total-saleObj.grand_total - # saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj) - # end + end - # saleObj = Sale.find(sale_id) - sale_payment = SalePayment.new - status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga") - if status == true - @out = true, "Success!" - else - @out =false, "Please try again payment!" - end - end - end - - #Shop Name in Navbor - helper_method :shop_detail - def shop_detail - @shop = Shop.first + def create + sale_id = params[:sale_id] + @cashier_type = params[:type] + redeem_amount = params[:redeem_amount] + membership_id = params[:membership_id] + payment_method = "dinga" + if(Sale.exists?(sale_id)) + saleObj = Sale.find(sale_id) + shop_details = Shop::ShopDetail + + # rounding adjustment + if shop_details.is_rounding_adj + new_total = Sale.get_rounding_adjustment(saleObj.grand_total) + rounding_adj = new_total-saleObj.grand_total + saleObj.update_attributes(grand_total: new_total,old_grand_total: saleObj.grand_total,rounding_adjustment:rounding_adj) + end + + sale_payment = SalePayment.new + status,msg =sale_payment.process_payment(saleObj, @user, redeem_amount,payment_method) + if status == true + @out = true, "Success!" + else + @out =false, "Please try again payment!" + end + else + @out = false, "There has no sale record!" end + + end + end diff --git a/app/controllers/origami/movetable_controller.rb b/app/controllers/origami/movetable_controller.rb index 20aaf0c5..3844293e 100755 --- a/app/controllers/origami/movetable_controller.rb +++ b/app/controllers/origami/movetable_controller.rb @@ -62,9 +62,19 @@ class Origami::MovetableController < BaseOrigamiController bookings = Booking.where('dining_facility_id=?',change_from) booking_array = Array.new - bookings.each do | booking | - if booking.sale_id.nil? && booking.booking_status != 'moved' - booking_array.push(booking) + order_items = Array.new + if !bookings.nil? + bookings.each do | booking | + if booking.sale_id.nil? && booking.booking_status != 'moved' + booking_array.push(booking) + end + + booking.booking_orders.each do |booking_order| + order = Order.find(booking_order.order_id) + order.order_items.each do |order_item| + order_items.push(order_item) + end + end end end @@ -82,12 +92,13 @@ class Origami::MovetableController < BaseOrigamiController #print_settings = PrintSetting.find_by_unique_code(unique_code) printer_array = [] printer_array = PrintSetting.where(:unique_code => unique_code) + for i in 0..pdf_no if i != pdf_no print_settings = printer_array[i] - printer = Printer::ReceiptPrinter.new(print_settings) - printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by) + printer = Printer::ReceiptPrinter.new(print_settings) + printer.print_move_table(print_settings,@to,@from ,@shop,@date,@type,@moved_by,order_items) end end - end + end end diff --git a/app/controllers/print_settings_controller.rb b/app/controllers/print_settings_controller.rb index 991f4ad2..3bf37ae8 100755 --- a/app/controllers/print_settings_controller.rb +++ b/app/controllers/print_settings_controller.rb @@ -85,7 +85,7 @@ class PrintSettingsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def print_setting_params - params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :brand_name, :printer_type, :font, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space) + params.require(:print_setting).permit(:name, :unique_code, :template, :printer_name, :font,:header_font_size, :item_font_size, :api_settings, :page_width, :page_height, :print_copies,:precision,:delimiter,:heading_space) end #Shop Name in Navbor diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb index 7e9a2247..8562fca6 100755 --- a/app/models/printer/receipt_printer.rb +++ b/app/models/printer/receipt_printer.rb @@ -264,11 +264,11 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker end #Move Table Print - def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by) + def print_move_table(printer_settings,to,from,shop_detail,date,type,moved_by,order_items) #Use CUPS service #Generate PDF #Print - pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by) + pdf = MoveTablePdf.new(printer_settings,to,from,shop_detail,date,type,moved_by,order_items) pdf.render_file "tmp/print_move_table.pdf" self.print("tmp/print_move_table.pdf") end diff --git a/app/models/sale.rb b/app/models/sale.rb old mode 100755 new mode 100644 diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb index d8c1519a..035bb792 100755 --- a/app/models/sale_payment.rb +++ b/app/models/sale_payment.rb @@ -257,7 +257,7 @@ class SalePayment < ApplicationRecord payment_status = false # add to sale item with foc - sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }' and status is null") + sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }'") sale_items.each do|item| SaleItem.update_existing_item(item.qty, item, self.sale.sale_id, "foc", item.unit_price, item.price) @@ -410,10 +410,10 @@ class SalePayment < ApplicationRecord #Next time - validate if the vochure number is valid - within customer_data = Customer.find_by_customer_id(self.sale.customer_id) membership_setting = MembershipSetting.find_by_membership_type("paypar_url") - membership_data = SalePayment.create_payment(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id) + membership_data = SalePayment.redeem(membership_setting.gateway_url,membership_setting.auth_token,customer_data.membership_id,self.received_amount,self.sale.sale_id) #record an payment in sale-audit - remark = "#{membership_data} Dinga Payment- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} " + remark = "#{membership_data} Redeem- for Customer #{self.sale.customer_id} Sale Id [#{self.sale.sale_id}]| pay amount -> #{self.received_amount} " sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1) if membership_data["status"]==true @@ -429,8 +429,8 @@ class SalePayment < ApplicationRecord else sale_update_payment_status(0) end - return payment_status + end def sale_update_payment_status(paid_amount,check_foc = false) diff --git a/app/pdf/call_waiter_pdf.rb b/app/pdf/call_waiter_pdf.rb index a1ea756b..9ab43985 100644 --- a/app/pdf/call_waiter_pdf.rb +++ b/app/pdf/call_waiter_pdf.rb @@ -3,6 +3,8 @@ class CallWaiterPdf < Prawn::Document def initialize(printer_settings, table,time,shop_detail) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 5 self.price_width = 35 self.qty_width = 20 @@ -27,9 +29,6 @@ class CallWaiterPdf < Prawn::Document fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end - self.header_font_size = 10 - self.item_font_size = 8 - header( shop_detail.name, printer_settings.name) call_waiter(table) @@ -68,4 +67,4 @@ class CallWaiterPdf < Prawn::Document # end -end +end \ No newline at end of file diff --git a/app/pdf/close_cashier_customise_pdf.rb b/app/pdf/close_cashier_customise_pdf.rb index bcc27724..84311caa 100644 --- a/app/pdf/close_cashier_customise_pdf.rb +++ b/app/pdf/close_cashier_customise_pdf.rb @@ -5,6 +5,8 @@ class CloseCashierCustomisePdf < Prawn::Document def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,total_dinein,total_takeway,total_other_charges) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 5 self.price_width = 60 self.qty_width = 20 @@ -36,8 +38,6 @@ class CloseCashierCustomisePdf < Prawn::Document end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 10 - self.item_font_size = 8 #precision checked if printer_settings.precision.to_i > 2 diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb index 7ac7a130..a1c92637 100755 --- a/app/pdf/close_cashier_pdf.rb +++ b/app/pdf/close_cashier_pdf.rb @@ -5,6 +5,8 @@ class CloseCashierPdf < Prawn::Document def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 5 self.price_width = 60 self.qty_width = 20 @@ -36,8 +38,6 @@ class CloseCashierPdf < Prawn::Document end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 10 - self.item_font_size = 8 #precision checked if printer_settings.precision.to_i > 2 diff --git a/app/pdf/crm_order_pdf.rb b/app/pdf/crm_order_pdf.rb index a33b5fce..f9367907 100755 --- a/app/pdf/crm_order_pdf.rb +++ b/app/pdf/crm_order_pdf.rb @@ -3,6 +3,8 @@ class CrmOrderPdf < Prawn::Document def initialize(booking,order_items,printer_settings) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 10 # self.price_width = self.p_width / 2 self.price_width=80 @@ -31,9 +33,6 @@ class CrmOrderPdf < Prawn::Document font "#{printer_settings.font}" fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end - - self.header_font_size = 10 - self.item_font_size = 9 header( printer_settings.printer_name, printer_settings.name) stroke_horizontal_rule diff --git a/app/pdf/move_table_pdf.rb b/app/pdf/move_table_pdf.rb index 7b4ad8e4..9940c42d 100644 --- a/app/pdf/move_table_pdf.rb +++ b/app/pdf/move_table_pdf.rb @@ -1,16 +1,19 @@ class MoveTablePdf < Prawn::Document - attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width - def initialize(printer_settings,to,from,shop_detail,date,type,moved_by) + include ActionView::Helpers::NumberHelper + attr_accessor :label_width,:price_column_width,:page_width, :page_height, :margin, :price_width, :item_width, :header_font_size, :item_font_size,:item_height,:qty_width,:total_width,:item_description_width + def initialize(printer_settings,to,from,shop_detail,date,type,moved_by,order_items) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height - self.margin = 5 - self.price_width = 35 - self.qty_width = 20 - self.total_width = 35 - self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width)) - self.item_height = 15 - self.item_description_width = (self.page_width-20) / 2 - self.label_width = 100 + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i + self.margin = 0 + self.price_width = 40 # No Need for item + self.qty_width = 40 + self.total_width = 40 # No Need for item + self.item_width = self.page_width - (self.qty_width - self.margin) + self.item_height = 15 + self.item_description_width = self.page_width - (self.price_width + self.qty_width + self.total_width) + self.label_width=90 super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height]) @@ -27,9 +30,6 @@ class MoveTablePdf < Prawn::Document fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end - self.header_font_size = 10 - self.item_font_size = 8 - header(printer_settings.name,type) call_move_table(to,from,date,type,moved_by) @@ -38,6 +38,12 @@ class MoveTablePdf < Prawn::Document stroke_horizontal_rule move_down 5 + add_lining_item(order_items, printer_settings.precision) + + move_down 5 + stroke_horizontal_rule + move_down 5 + end def header (name,type) @@ -55,5 +61,57 @@ class MoveTablePdf < Prawn::Document text "Moved By : #{moved_by}", :left_margin => -10, :size => self.header_font_size end + def add_lining_item(order_items, precision) + y_position = cursor -end \ No newline at end of file + bounding_box([0,y_position], :width => self.item_width) do + text "Item", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width,y_position], :width => self.qty_width) do + text "Qty", :size => self.item_font_size,:align => :left + end + + stroke_horizontal_rule + move_down 5 + + add_item(order_items, precision) + end + + # Add order items under order info + def add_item(order_items, precision) + y_position = cursor + + move_down 5 + + order_items.each do|odi| + # check for item not to show + # if odi.price != 0 + y_position = cursor + + # bounding_box([0,y_position], :width => self.item_width + 60, :height => self.item_height) do + # text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left + # end + bounding_box([0,y_position], :width => self.item_width) do + text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left + end + + bounding_box([self.item_width,y_position], :width => self.qty_width) do + text "#{number_with_precision(odi.qty, :precision => precision.to_i)}", :size => self.item_font_size,:align => :left + end + + bounding_box([0,y_position], :width => self.item_width) do + text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left + end + + if !(odi.alt_name).empty? + move_down 4 + font("public/fonts/NotoSansCJKtc-Regular.ttf") do + text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true + end + end + + end + end + +end diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb index 58682d8a..9f7ce125 100755 --- a/app/pdf/order_item_pdf.rb +++ b/app/pdf/order_item_pdf.rb @@ -4,6 +4,8 @@ class OrderItemPdf < Prawn::Document def initialize(print_settings,order_item, print_status, options, alt_name, before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height + self.header_font_size = print_settings.header_font_size.to_i + self.item_font_size = print_settings.item_font_size.to_i self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -26,13 +28,7 @@ class OrderItemPdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb index 05add2c9..118927f6 100755 --- a/app/pdf/order_item_slim_pdf.rb +++ b/app/pdf/order_item_slim_pdf.rb @@ -4,6 +4,8 @@ class OrderItemSlimPdf < Prawn::Document def initialize(print_settings,order_item_slim, print_status, options, alt_name, before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -26,13 +28,7 @@ class OrderItemSlimPdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" diff --git a/app/pdf/order_set_item_pdf.rb b/app/pdf/order_set_item_pdf.rb index ce06081f..1e7b9c7f 100755 --- a/app/pdf/order_set_item_pdf.rb +++ b/app/pdf/order_set_item_pdf.rb @@ -4,6 +4,8 @@ class OrderSetItemPdf < Prawn::Document def initialize(print_settings,order_set_item, print_status, options, alt_name, before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -26,13 +28,7 @@ class OrderSetItemPdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb index 17cf905c..5feb337e 100755 --- a/app/pdf/order_summary_pdf.rb +++ b/app/pdf/order_summary_pdf.rb @@ -4,6 +4,8 @@ class OrderSummaryPdf < Prawn::Document def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height + self.header_font_size = print_settings.header_font_size.to_i + self.item_font_size = print_settings.item_font_size.to_i self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -25,13 +27,7 @@ class OrderSummaryPdf < Prawn::Document }) font "#{print_settings.font}" - fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 + fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end # font "public/fonts/Zawgyi-One.ttf" diff --git a/app/pdf/order_summary_set_pdf.rb b/app/pdf/order_summary_set_pdf.rb index 14b2f796..b9723a5c 100755 --- a/app/pdf/order_summary_set_pdf.rb +++ b/app/pdf/order_summary_set_pdf.rb @@ -4,6 +4,8 @@ class OrderSummarySetPdf < Prawn::Document def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -26,12 +28,6 @@ class OrderSummarySetPdf < Prawn::Document font "#{print_settings.font}" fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 end # font "public/fonts/Zawgyi-One.ttf" diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb index c88061ea..77aafc60 100755 --- a/app/pdf/order_summary_slim_pdf.rb +++ b/app/pdf/order_summary_slim_pdf.rb @@ -4,6 +4,8 @@ class OrderSummarySlimPdf < Prawn::Document def initialize(print_settings,order, print_status, order_items = nil,alt_name,before_updated_qty) self.page_width = print_settings.page_width self.page_height = print_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 0 self.price_width = 40 # No Need for item self.qty_width = 40 @@ -26,12 +28,6 @@ class OrderSummarySlimPdf < Prawn::Document font "#{print_settings.font}" fallback_fonts ["Courier", "Helvetica", "Times-Roman"] - - self.header_font_size = 11 - self.item_font_size = 9 - else - self.header_font_size = 12 - self.item_font_size = 10 end # font "public/fonts/Zawgyi-One.ttf" diff --git a/app/pdf/queue_no_pdf.rb b/app/pdf/queue_no_pdf.rb index cce7eb94..89cca4ca 100755 --- a/app/pdf/queue_no_pdf.rb +++ b/app/pdf/queue_no_pdf.rb @@ -3,6 +3,8 @@ class QueueNoPdf < Prawn::Document def initialize(printer_settings, queue) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 5 self.price_width = 35 self.qty_width = 20 @@ -27,9 +29,6 @@ class QueueNoPdf < Prawn::Document fallback_fonts ["Courier", "Helvetica", "Times-Roman"] end - self.header_font_size = 10 - self.item_font_size = 8 - header( "Beauty In the Pot", printer_settings.name) queue_no(queue) diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb index 604d99dd..7253bfe1 100644 --- a/app/pdf/receipt_bill_a5_pdf.rb +++ b/app/pdf/receipt_bill_a5_pdf.rb @@ -5,6 +5,8 @@ class ReceiptBillA5Pdf < Prawn::Document def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 15 self.price_width = 120 self.qty_width = 50 @@ -43,8 +45,6 @@ class ReceiptBillA5Pdf < Prawn::Document end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 16 - self.item_font_size = 14 if printer_settings.delimiter delimiter = "," diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb index c0299033..a04cfcad 100755 --- a/app/pdf/receipt_bill_pdf.rb +++ b/app/pdf/receipt_bill_pdf.rb @@ -6,6 +6,8 @@ class ReceiptBillPdf < Prawn::Document def initialize(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info = nil,rebate_amount = nil,shop_details, printed_status,current_balance,card_data) self.page_width = printer_settings.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 0 self.price_width = 60 self.qty_width = 25 @@ -44,8 +46,6 @@ class ReceiptBillPdf < Prawn::Document end # font "public/fonts/Zawgyi-One.ttf" # font "public/fonts/padauk.ttf" - self.header_font_size = 10 - self.item_font_size = 8 if printer_settings.delimiter delimiter = "," diff --git a/app/pdf/stock_result_pdf.rb b/app/pdf/stock_result_pdf.rb index 510ab317..1da06dd2 100755 --- a/app/pdf/stock_result_pdf.rb +++ b/app/pdf/stock_result_pdf.rb @@ -4,6 +4,8 @@ class StockResultPdf < Prawn::Document def initialize(printer_settings, stockcheck, stockcheck_items, checker_name, shop_details) self.page_width = printer_settings.page_width #PrintSetting.where("name = ?","Close Cashier").first.page_width self.page_height = printer_settings.page_height + self.header_font_size = printer_settings.header_font_size.to_i + self.item_font_size = printer_settings.item_font_size.to_i self.margin = 5 self.price_width = 40 self.qty_width = 20 @@ -35,9 +37,7 @@ class StockResultPdf < Prawn::Document end # font "public/fonts/Zawgyi-One.ttf" - # font "public/fonts/padauk.ttf" - self.header_font_size = 10 - self.item_font_size = 8 +# font "public/fonts/padauk.ttf" header(shop_details) diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb index 372c05e9..70523063 100755 --- a/app/views/crm/customers/index.html.erb +++ b/app/views/crm/customers/index.html.erb @@ -142,7 +142,7 @@ $(function() { }); // QR Code Reader - $("#qr_code").on('click', function(e){ + $("#qr_code").on('sclick', function(e){ var code = ""; setTimeout(function(){ code=getQRCode(); @@ -281,4 +281,8 @@ $(document).on('click',".customer_tr",function(){ return false; }); + $("#sxModal .btn_cancel").on('click',function(){ + $("#sxModal").hide(); + }); + diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb index e83a11d0..d6c6c955 100755 --- a/app/views/layouts/login.html.erb +++ b/app/views/layouts/login.html.erb @@ -79,6 +79,13 @@ Version - 1.0.1

+
+
+
+ <%= shop_detail.name %> +
+
+
<%= simple_form_for(@login_form, url: login_path, method: "post") do |f| %>
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb index 329e9240..5db72f79 100755 --- a/app/views/layouts/login_dashboard.html.erb +++ b/app/views/layouts/login_dashboard.html.erb @@ -65,6 +65,13 @@

+
+
+
+ <%= shop_detail.name %> +
+
+
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb index 59badabe..e5de4885 100755 --- a/app/views/origami/customers/index.html.erb +++ b/app/views/origami/customers/index.html.erb @@ -360,9 +360,42 @@ // QR Code Reader $("#qr_code").on('click', function(e){ var code = ""; + var customer_id = ''; + var customer_name = ''; + var sale_id = $("#sale_id").val() || 0; + var customer_mamber_card_no = 0; + setTimeout(function(){ - code=getQRCode(); - setQRCode(code); + code=getQRCode(); + setQRCode(code); + + customer_mamber_card_no = $("#search").val(); + + if(sale_id != 0 && customer_mamber_card_no != 0){ + $.ajax({ + type: "POST", + url: "/origami/"+sale_id+"/get_customer" , + data: { filter : customer_mamber_card_no ,type :"card"}, + dataType: "json", + success: function(data) { + if (data[0].customer_id == false) { + swal("Alert!", data[0].message, "error"); + // $.alert({ + // title: 'Alert!', + // content: data[0].message, + // type: 'red', + // typeAnimated: true, + // btnClass: 'btn-danger', + // }); + }else{ + customer_id = data[0].customer_id; + customer_name = data[0].name; + update_sale(customer_id, customer_name,sale_id); + } + + } + }); + } },100); }); diff --git a/app/views/origami/dinga/index.html.erb b/app/views/origami/dinga/index.html.erb index bf9d5049..1b35710f 100644 --- a/app/views/origami/dinga/index.html.erb +++ b/app/views/origami/dinga/index.html.erb @@ -15,41 +15,41 @@
- - <%@payment_prices = @payment_prices +@rounding_adj%> - + + <%@redeem_prices = @redeem_prices +@rounding_adj%> +
- <% if @payparcount > 0 %> + <% if @dingacount > 0 %>
- - + +
<% end %>
- +
- +
0.0
- +

You can rebate upto <%= @redeem_prices %>

-->
@@ -92,7 +92,7 @@
10000
-
Pay
+
Pay
@@ -109,13 +109,12 @@