Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/models/printer/printer_worker.rb

@@ -24,11 +24,11 @@ class Printer::PrinterWorker
     end
   end
 
-  def printers()
+  def self.printers()
     Cups.show_destinations
   end
 
-  def default_printer()
+  def self.default_printer()
     Cups.default_printer
   end
 

app/views/origami/movetable/move_dining.html.erb

@@ -94,11 +94,13 @@
     <% else %>
       <div id="save_order_id" data-order="">
     <% end %>
-      <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
-      <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %>
-        <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
-      <% else %>
-        <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+      <% if !@booking.nil? %>
+        <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>
+        <% if @booking.checkout_by.nil? && !@booking.reserved_by.nil? %>
+          <span class="float-right"><%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %> - <%= @booking.checkout_at.utc.getlocal.strftime("%I:%M %p") %></span>
+        <% else %>
+          <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+        <% end %>
       <% end %>
       </div>
   <% elsif @status_sale == 'sale' %>
@@ -149,10 +151,10 @@
    <div class="row p-l-5 p-r-5">
         <div class="col-lg-6 col-md-6 col-sm-6">
        
-          <% if @status_sale == 'sale' %>
+          <% if @status_sale == 'sale' && !@sale_array.empty? %>
               <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
               &nbsp; Customer : <%= @sale_array[0].customer.name rescue '' %>
-          <% elsif @status_order == 'order'
+          <% elsif @status_order == 'order' && !@customer.nil?
              %>
               <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
               &nbsp; Customer : <%= @customer.name rescue "" %>

app/views/print_settings/_form.html.erb

@@ -11,7 +11,7 @@
           <%= f.input :unique_code %>
           <%= f.input :template %>
           <%= f.input :font %>
-          <%= f.input :printer_name %>
+          <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
           <%= f.input :api_settings %>
           <%= f.input :page_width %>
           <%= f.input :page_height %>

app/views/settings/cashier_terminals/_form.html.erb

@@ -12,7 +12,7 @@
           <%= f.input :auto_print_receipt %>
           <%= f.label "Select Zones", :class => 'control-label' %>
           <%= f.collection_check_boxes :zone_ids , Zone.all, :id, :name , :class => 'checkbox form-group'%>
-          <%= f.input :printer_name %>
+          <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
           <%= f.input :font %>
           <%= f.input :font_size %>
           <%= f.input :show_tax %>

app/views/settings/order_queue_stations/_form.html.erb

@@ -16,7 +16,7 @@ div.form-inputs span{
           <%= f.input :station_name %>
           <%= f.input :is_active %>
 
-          <%= f.input :printer_name %>
+          <%= f.input :printer_name, :as => :select, :collection => Printer::PrinterWorker.printers, include_blank: false %>
       <!--     <%= f.input :font_size %> -->
           <%= f.input :print_copy %>
           <%= f.hidden_field :processing_items %>