Merge branch 'adminbsb_material_ui'

2018-06-01 10:26:01 +06:30
parent 0d0e16e4b4 bc9ac00cfe
commit 7ba0019695
3 changed files with 60 additions and 59 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -250,7 +250,11 @@ class Origami::PaymentsController < BaseOrigamiController
      @table_no = ''
      @dining  = ''
      @other_payment = 0.0
-
+      @pdf_view = nil
+      @lookup_pdf = Lookup.find_by_lookup_type("ReceiptPdfView")
+      if !@lookup_pdf.nil?
+        @pdf_view = @lookup_pdf.value
+      end
      @shop        =  Shop.first  #show shop info 

      @customer_lists = Customer.where("customer_id = 'CUS-000000000001' or customer_id = 'CUS-000000000002'")