From dc2637ed39b1761ed15b2e3c08343a022b3ac000 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 15 Jan 2018 16:32:20 +0630
Subject: [PATCH 01/18] change process flow for extra time

---
 app/controllers/api/orders_controller.rb      | 21 ++++++-------------
 .../origami/addorders_controller.rb           | 19 ++++++-----------
 2 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index 1616be04..deb1039e 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -54,22 +54,13 @@ class Api::OrdersController <  Api::ApiController
     extra_time = ''
 
     params[:order_items].each { |i| 
-       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' || i["item_instance_code"] == 'Extie45' || i["item_instance_code"] == 'Extie15'
+       i["item_instance_code"] = i["item_instance_code"].downcase.to_s
+       if i["item_instance_code"].include? "ext"
          is_extra_time = true
-         if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
-          t = Time.now
-           time = 30*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         elsif i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie15'
-           time = 15*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         elsif i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extie45'
-           time = 45*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         else
-          t = Time.now
-           time = 60*60*i["quantity"].to_i
-           extra_time = Time.at(time)
+         arr_exts = i["item_instance_code"].split("_")
+         if arr_exts[1].match(/^(\d)+$/)
+          time = arr_exts[1].to_i*60*i["quantity"].to_i
+          extra_time = Time.at(time)
          end
        end
      }
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 9a06af0b..6b4200da 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -67,20 +67,13 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
 
     items_arr = []
     JSON.parse(params[:order_items]).each { |i| 
-       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30' || i["item_instance_code"] == 'Extie45' || i["item_instance_code"] == 'Extie15'
+      i["item_instance_code"] = i["item_instance_code"].downcase.to_s
+       if i["item_instance_code"].include? "ext"
          is_extra_time = true
-         if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
-           time = 30*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         elsif i["item_instance_code"] == 'Extim15' || i["item_instance_code"] == 'Extie15'
-           time = 15*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         elsif i["item_instance_code"] == 'Extim45' || i["item_instance_code"] == 'Extie45'
-           time = 45*60*i["quantity"].to_i
-           extra_time = Time.at(time)
-         else
-           time = 60*60*i["quantity"].to_i
-           extra_time = Time.at(time)
+         arr_exts = i["item_instance_code"].split("_")
+         if arr_exts[1].match(/^(\d)+$/)
+          time = arr_exts[1].to_i*60*i["quantity"].to_i
+          extra_time = Time.at(time)
          end
        end
        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}

From b480f8cd61fea214a604771f8f5c0bc3ce93b57b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 15 Jan 2018 16:47:41 +0630
Subject: [PATCH 02/18] update payment detail show

---
 app/views/origami/payments/show.html.erb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 78660997..97c4d216 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -313,8 +313,8 @@
         }
 
         payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
-        console.log(payment_type)
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
+          
           if (member_id && member_discount) {
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
@@ -457,9 +457,9 @@
             var credit = $('#credit').text();
             var card   = $('#card').text();
 
-           if (credit <= 0) {
-            calculate_member_discount(sale_id);
-           }
+            if (credit <= 0) {
+              calculate_member_discount(sale_id);
+            }
             
             $.ajax({type: "POST",
               url: "<%= origami_payment_cash_path %>",

From fb989572b1c89bad7b3612df17898478af2e6372 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 15 Jan 2018 17:48:35 +0630
Subject: [PATCH 03/18] update room for first bill

---
 app/controllers/origami/void_controller.rb |  3 ++
 app/views/origami/home/show.html.erb       |  2 +-
 app/views/origami/rooms/show.html.erb      | 60 +++++++++++++---------
 3 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index a0c4a23b..0d368224 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -63,6 +63,7 @@ class Origami::VoidController < BaseOrigamiController
 
       member_info   = nil
       rebate_amount = nil
+      current_balance = nil
 
       # For Cashier by Zone
       bookings = Booking.where("sale_id='#{sale_id}'")
@@ -87,7 +88,9 @@ class Origami::VoidController < BaseOrigamiController
         if customer.membership_id != nil && rebate
           member_info = Customer.get_member_account(customer)
           rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+          current_balance = SaleAudit.paymal_search(sale_id)
         end
+
         # get printer info
         print_settings=PrintSetting.find_by_unique_code(unique_code)
         # Calculate Food and Beverage Total
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index fc1a5b20..372efa83 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -576,7 +576,7 @@
               swal ( "Oops" ,  "Please select an table!" ,  "warning" );
             }
           }else{
-                  swal("Opps","You are not authorized for void","warning")
+                  swal("Opps","You are not authorized for Discount","warning")
           }
             return false;
         });
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index f8dc69f0..00350f1b 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -367,17 +367,21 @@
         <!-- <button type="button" class="btn bg-blue btn-block" disabled>Add Order</button> -->
         <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
         <button type="button" class="btn bg-blue btn-block" id='edit'>Edit</button>
-        <button type="button" id="discount" class="btn bg-blue btn-block" >Discount</button>
+        <button type="button" id="discount" class="btn bg-blue btn-block" active="<%= can? :index, :discount %>" >Discount</button>
         <button type="button" id="other-charges" class="btn bg-blue btn-block" >Charges</button>
         
         <button type="button" id="commissions" class="btn btn-block bg-blue waves-effect">Commissions</button>
         <button type="button" id="in_duties" class="btn btn-block bg-blue waves-effect">In Duties</button>
-        <!-- <button type="button" class="btn bg-blue btn-block" id='move' disabled="">Move</button> -->
-        <!-- <button type="button" id="request_bills" class="btn bg-blue btn-block" disabled> Req.Bill</button> -->
          <!-- first bill not used in cloud -->
-        <% if ENV["SERVER_MODE"] != "cloud" %>
-          <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
-        <% end %>
+         <% if ENV["SERVER_MODE"] == "cloud" %>
+         <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+         <% else %>
+         <%if @membership.discount && @obj_sale.customer.membership_id %>
+            <button type="button" class="btn btn-block bg-blue waves-effect" data-toggle="modal" data-target="#paymentModal">First Bill</button>
+         <%else%>
+            <button type="button" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+         <%end%>
+         <%end%>
         <button type="button" id="pay" class="btn bg-blue btn-block">Pay</button>
         <button type="button" id="void" class="btn bg-blue btn-block" > Void </button>
      <% end %>
@@ -393,6 +397,7 @@
                         <div class="modal-body">
                            <select class="form-control show-tick payment_method" multiple="true"  id="payment_method" >
                              <option value="Cash">Cash</option>
+                             <option value="Credit">Credit</option>
                             <% @payment_methods.each do |pay| %>
                               <option value="<%= pay.payment_method %>">
                                 <%= pay.payment_method %>
@@ -535,25 +540,29 @@ $(document).ready(function(){
     return false;
   });
 
-  
   // Discount for Payment
-  $('#discount').click(function() {
-    var sale = $('#sale_id').val();
-    if (sale!="") {
-      var sale_id = sale
+  $('#discount').click(function () {
+
+    if ($(this).attr('active')=== "true") {
+      var sale = $('#sale_id').val();
+      if (sale != "") {
+        var sale_id = sale
+      } else {
+        var sale_id = $('#save_order_id').attr('data-order');
+      }
+
+      if (sale_id != "") {
+        window.location.href = '/origami/' + sale_id + '/discount'
+      }
+      else {
+        swal ( "Oops" ,  "Please select an table!" ,  "warning" );
+      }
     }else{
-      var sale_id = $('#save_order_id').attr('data-order');
+      swal("Opps","You are not authorized for Discount","warning")
     }
-
-    if(sale_id!=""){
-      window.location.href = '/origami/' + sale_id + '/discount'
-    }
-    else {
-      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
-    }
-
     return false;
   });
+  // Discount for Payment
 
   // Add Other Charges
   $('#other-charges').click(function() {
@@ -595,11 +604,17 @@ $("#first_bill").on('click', function(){
 
 $(".choose_payment").on('click', function () {
   $( "#loading_wrapper").show();
+
   var sale_id = $('#sale_id').val();
   type = $('.payment_method').val();
+  if(parseInt(jQuery.inArray("Credit", type)) == -1){
+    if (parseInt(jQuery.inArray("MPU", type)) > 0 || parseInt(jQuery.inArray("VISA", type)) > 0 || parseInt(jQuery.inArray("JCB", type)) > 0 || parseInt(jQuery.inArray("Master", type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", type)) > 0 || parseInt(jQuery.inArray("Redeem", type)) > 0) {
+      calculate_member_discount(sale_id,"Card");
 
-  calculate_member_discount(sale_id,type);
-
+    }else{
+      calculate_member_discount(sale_id,"Cash");
+    }         
+  }
   var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
   $.ajax({
     type: "GET",
@@ -609,7 +624,6 @@ $(".choose_payment").on('click', function () {
       receipt_no = ($("#receipt_no").html()).trim();
       if((receipt_no!=undefined) && (receipt_no!=""))
         createReceiptNoInFirstBillData(receipt_no,type);
-      
       location.reload();
     }
   });  

From fe846ea89a66a88236cc13fce97bfa4d643326cc Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 09:40:29 +0630
Subject: [PATCH 04/18] update secrets yml

---
 config/secrets.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/secrets.yml b/config/secrets.yml
index 48ad8e2c..99360dad 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -25,7 +25,7 @@ test:
 production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
   sx_provision_url: connect.smartsales.asia/api #192.168.1.147:3002/api
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
 

From ca98efc756715e1925dd4af7cf920e8f837fc9b3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 10:15:28 +0630
Subject: [PATCH 05/18] change checkout time and checkout alert time process

---
 README.md                                     | 36 ++++++++++++++++---
 .../api/check_in_process_controller.rb        | 25 +++++++------
 .../origami/check_in_process_controller.rb    | 12 ++++---
 app/models/dining_facility.rb                 | 24 ++++++++-----
 4 files changed, 70 insertions(+), 27 deletions(-)

diff --git a/README.md b/README.md
index 5be96143..ec64ef45 100755
--- a/README.md
+++ b/README.md
@@ -36,11 +36,12 @@ java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 Person and Extra Time
   category_code = SPL... //for menu categories
   
-Extra Time 
-  instance_code = Extim30, Extim60 //for morning menu
-  instance_code = Extie30, Extie60 //for evening menu
+For Extra Time 
+  item_instance_code 
+  * must start with 'Ext'[a..z]'_'[1..100]
+  * note : don't add character after '_' 
 
-Order Item & Order Summary Slim
+For Order Item & Order Summary Slim
 	*** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf
 	1) settings/print_settings
 	2) app/controllers/oqs/edit_controller.rb
@@ -53,6 +54,33 @@ For Bank Integration setting
   1) rake db:migrate for card_sale_trans, card_settle_trans
   2) settings/lookups => { type:bank_integration, name: Bank Integration, value:1 }
 
+For checkout time and checkout alert time
+  1) checkout time => { type: checkout_time, name: 9:00AM - 12:00 PM, value: 120 }
+  2) checkout alert time => { type: checkout_alert_time, name: 8:00AM - 12:00 PM, value: 60 }
+  * you can add multiple record for checkout time and checkout alert time
+  * type must be 'checkout_time' and 'checkout_alert_time'
+  * you can change name and value
+  * name must be time range [8:30 AM - 1:45 PM]
+  * value must be minutes[60]
+
+For call waiter pdf
+  * Backend > Printer > Print Settings > New
+    i)  Name : Calling Waiter
+    ii) Unique Code: CallWaiterPdf
+    iii)Template: ...
+	iv) Font: Zawgyi-One 
+	v)	Printer: #printer name
+
+Membership Actions SQL
+	* update membership_actions set additional_parameter='{\"campaign_type_id\":5}' where id=10;
+
+SQL Update after rake clear:data runned
+	* update seed_generators 
+	 i) TableBooking, Order, OrderItem, sale, SaleOrder, SaleItem, SaleTax, SalePayment, SaleAudit, AssignedOrderItem => { current:0, next:0 }
+	** Note :: do not update Customer 
+
+
+
 * ToDo list
 
 1. Cloud Sync
diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index ac43bfd9..7ad00d67 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -16,11 +16,15 @@ class Api::CheckInProcessController < Api::ApiController
 				lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
 				alert_time_min = 0
 				if !lookup_checkout_time.nil?
-					if lookup_checkout_time[0][0] == 'min'
-					  alert_time_min = (lookup_checkout_time[0][1]).to_i
-					else
-					  alert_time_min = 15
-					end
+					now = Time.now.utc
+			        lookup_checkout_time.each do |checkout_time|
+			          arr_time = checkout_time[0].split("-")
+			          start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
+			          end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+			          if start_time <= now && now <= end_time
+			            alert_time_min = checkout_time[1].to_i
+			          end
+			        end
 				end
 
 				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min, :extra_minutes => extra_minutes }
@@ -39,11 +43,12 @@ class Api::CheckInProcessController < Api::ApiController
 				if !lookup_checkout_time.empty?
 					checkout_at = Time.now.utc
 
-					if !lookup_checkout_time.nil?
-						if lookup_checkout_time[0][0] == 'hr'
-							checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.hour
-						else
-							checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.minutes
+					lookup_checkout_time.each do |checkout_time|
+						arr_time = checkout_time[0].split("-")
+						start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
+						end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+						if start_time <= checkout_at && checkout_at <= end_time
+							checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
 						end
 					end
 
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 37f58d8f..40a28398 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -3,12 +3,14 @@ class Origami::CheckInProcessController < BaseOrigamiController
 	def check_in_process
 		lookup_checkout_time = Lookup.collection_of("checkout_time")
 		checkout_at = Time.now.utc
-
 		if !lookup_checkout_time.nil?
-			if lookup_checkout_time[0][0] == 'hr'
-				checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.hour
-			else
-				checkout_at = checkout_at + (lookup_checkout_time[0][1]).to_i.minutes
+			lookup_checkout_time.each do |checkout_time|
+				arr_time = checkout_time[0].split("-")
+				start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
+				end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+				if start_time <= checkout_at && checkout_at <= end_time
+					checkout_at = checkout_at + (checkout_time[1]).to_i.minutes
+				end
 			end
 		end
 		@dining_facility = DiningFacility.find(params[:dining_id])
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index bd6f3436..1feab5d9 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -81,10 +81,14 @@ class DiningFacility < ApplicationRecord
       lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
       free_time_min = 0
       if !lookup_checkout_time.nil?
-        if lookup_checkout_time[0][0] == 'min'
-          free_time_min = (lookup_checkout_time[0][1]).to_i
-        else
-          free_time_min = 15
+        now = Time.now.utc
+        lookup_checkout_time.each do |checkout_time|
+          arr_time = checkout_time[0].split("-")
+          start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
+          end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+          if start_time <= now && now <= end_time
+            free_time_min = checkout_time[1].to_i
+          end
         end
       end
 
@@ -116,10 +120,14 @@ class DiningFacility < ApplicationRecord
       lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
       free_time_min = 0
       if !lookup_checkout_time.nil?
-        if lookup_checkout_time[0][0] == 'min'
-          free_time_min = (lookup_checkout_time[0][1]).to_i
-        else
-          free_time_min = 15
+        now = Time.now.utc
+        lookup_checkout_time.each do |checkout_time|
+          arr_time = checkout_time[0].split("-")
+          start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
+          end_time = Time.parse(arr_time[1].strip).utc.strftime("%H:%M%p")
+          if start_time <= now && now <= end_time
+            free_time_min = checkout_time[1].to_i
+          end
         end
       end
       

From eb29b206540219d464936b58ad1617e525c8d3b0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 10:57:20 +0630
Subject: [PATCH 06/18] update combine cloud and master bugs

---
 app/assets/javascripts/OQS.js                 | 48 ++++++++++---------
 app/controllers/origami/home_controller.rb    |  1 +
 .../origami/payments_controller.rb            |  2 -
 app/controllers/origami/shifts_controller.rb  | 35 +++++++-------
 app/models/ability.rb                         |  9 +++-
 app/views/layouts/_left_sidebar.html.erb      |  4 ++
 app/views/oqs/home/index.html.erb             |  6 ++-
 7 files changed, 59 insertions(+), 46 deletions(-)

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index ffaae308..6068b53f 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -217,29 +217,31 @@ $(document).on('turbolinks:load', function() {
   	});
 
   	// Print Order Item
-  	// $(document).on('click', '#print_order_item', function(event){ 
-  	// 	var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
-  	// 	var options = $('.selected-item').children('.card-block').find('.item-options').text();
-  	// 	var params = { 'options':options };
+  	$(document).on('click', '#print_order_item', function(event){ 
+  		var assigned_item_id = $('.selected-item').children('.card-block').children('.assigned-order-item').text();
+  		var options = $('.selected-item').children('.card-block').find('.item-options').text();
+  		var params = { 'options':options };
 
-  	// 	$.ajax({
-			// type: 'GET',
-	  //    	url: '/oqs/print/print/'+assigned_item_id,
-	  //    	success: function(data){	}
-  	// 	});
-  	// });
+  		$.ajax({
+			type: 'POST',
+	     	url: '/oqs/print/print/'+assigned_item_id,
+	     	data: params,
+	     	success: function(data){	}
+  		});
+  	});
 
-  	// Print Order Summary  	
-  	// $(document).on('click', '#print_order_summary', function(event){
-  	// 	var orderNo = $('.selected-item').attr('data-order-no');
-  	// 	var table_name=$('.selected-item').children().children().children('.order-zone').text().trim();
-  	// 	var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
-  	// 	var params = { 'table_name':table_name };
-  	// 	$.ajax({
-			// type: 'GET',
-	  //    	url: '/oqs/print/print_order_summary/'+assigned_item_id,
-	  //    	data: params,
-	  //    	success: function(data){	}
-  	// 	});
-  	// });
+  	// Print Order Summary
+  	// $('#print_order_summary').on('click',function(){
+  	$(document).on('click', '#print_order_summary', function(event){
+  		var orderNo = $('.selected-item').attr('data-order-no');
+  		var table_name=$('.selected-item').children().children().children('.order-zone').text().trim();
+  		var assigned_item_id=$('.selected-item').children('.card-block').children('.assigned-order-item').text();
+  		var params = { 'table_name':table_name };
+  		$.ajax({
+			type: 'GET',
+	     	url: '/oqs/print/print_order_summary/'+assigned_item_id,
+	     	data: params,
+	     	success: function(data){	}
+  		});
+  	});
 });
diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index fdf00b29..7a98ec47 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -1,4 +1,5 @@
 class Origami::HomeController < BaseOrigamiController
+  authorize_resource :class => false
  before_action :set_dining, only: [:show]
 
   def index
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index fecdbfc3..1c492338 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -21,8 +21,6 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
-    Rails.logger.debug ENV["SERVER_MODE"]
-
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       # Print for First Bill to Customer
       unique_code = "ReceiptBillPdf"
diff --git a/app/controllers/origami/shifts_controller.rb b/app/controllers/origami/shifts_controller.rb
index a6a2044d..6d0fbe02 100755
--- a/app/controllers/origami/shifts_controller.rb
+++ b/app/controllers/origami/shifts_controller.rb
@@ -54,27 +54,26 @@ class Origami::ShiftsController < BaseOrigamiController
         card_sett_trans.save()
       end
 
+      if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+        unique_code = "CloseCashierPdf"
+        shop_details = Shop.find(1)
+        #get tax
+        shift_obj      = ShiftSale.where('id =?',@shift.id)
+        @sale_taxes    = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
+        #other payment details for mpu or visa like card
+        @other_payment = ShiftSale.get_by_shift_other_payment(@shift)
 
-      # unique_code = "CloseCashierPdf"
-      # shop_details = Shop.find(1)
-      # #get tax
-      # shift_obj      = ShiftSale.where('id =?',@shift.id)
-      # @sale_taxes    = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
-      # #other payment details for mpu or visa like card
-      # @other_payment = ShiftSale.get_by_shift_other_payment(@shift)
+        # Calculate price_by_accounts
+        @total_amount_by_account    = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')
+        @total_discount_by_account  = ShiftSale.calculate_total_price_by_accounts(@shift,'discount')
+        @total_member_discount      = ShiftSale.get_total_member_discount(@shift)
+        # get printer info
+        print_settings = PrintSetting.find_by_unique_code(unique_code)
 
-      # # Calculate price_by_accounts
-      # @total_amount_by_account    = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')
-      # @total_discount_by_account  = ShiftSale.calculate_total_price_by_accounts(@shift,'discount')
-      # @total_member_discount      = ShiftSale.get_total_member_discount(@shift)
-      # # get printer info
-      # print_settings = PrintSetting.find_by_unique_code(unique_code)
+        printer = Printer::CashierStationPrinter.new(print_settings)
 
-      # printer = Printer::CashierStationPrinter.new(print_settings)
-
-      # printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
-
-      
+        printer.print_close_cashier(print_settings,cashier_terminal,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
+      end
     end
     Employee.logout(session[:session_token])
     session[:session_token] = nil  
diff --git a/app/models/ability.rb b/app/models/ability.rb
index 846b278a..d3082a1b 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -89,10 +89,14 @@ class Ability
 
         can :manage, Inventory
 
+        can :index, :home
+        can :show, :home
+
     elsif user.role == "cashier"
         
         # can :overall_void, :void
-
+        can :index, :home
+        can :show, :home
         can :read, Order
         can :update, Order
         can :menage, Booking
@@ -176,6 +180,9 @@ class Ability
         can :manage, Promotion
         can :manage, Product
 
+        can :index, :home
+        can :show, :home
+
     end
   end
 end
diff --git a/app/views/layouts/_left_sidebar.html.erb b/app/views/layouts/_left_sidebar.html.erb
index 80ea2fb1..c6b1356a 100755
--- a/app/views/layouts/_left_sidebar.html.erb
+++ b/app/views/layouts/_left_sidebar.html.erb
@@ -43,12 +43,14 @@
 				</a>
 			</li>
 			<% end %>
+			<% if can? :index, :home %> 
 			<li>
 				<a href="<%= origami_root_path %>">
 					<i class="material-icons">monetization_on</i>
 					<span><%= t :origami %></span>
 				</a>
 			</li>
+			<% end %>
 			<% if can? :menage, Customer %>
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
@@ -106,6 +108,7 @@
 					<% end %>
 				</ul>
 			</li>
+			<% if can? :index, :dailysale %> 
 			<li>
 				<a href="javascript:void(0);" class="menu-toggle">
 					<i class="material-icons">assessment</i>
@@ -141,6 +144,7 @@
 					</li>
 				</ul>
 			</li>	
+			<%end%>
 			<li class="header"><%= t :settings %></li>
 			<% if can? :menage, Zone %>
 			<li>
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index e5196917..2fd7f45d 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -168,8 +168,10 @@
   <div class="col-lg-1 col-md-1 col-sm-1">
     <!-- OQS Buttons -->
     <a href="<%= dashboard_path %>" class="btn btn-sm btn-block btn-default waves-effect" role="button" aria-haspopup="true"><i class="material-icons">reply</i> Back </a>
-    <!-- <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
-    <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>   -->   
+    <% if ENV["SERVER_MODE"] != "cloud" %>
+    <button type="button" title="Print Order Item" id="print_order_item" class="btn bg-blue btn-block btn-lg waves-effect">Print</a>
+      <button type="button" class="btn bg-blue btn-block btn-lg waves-effect" id="print_order_summary">Print <br/>Order<br/>Summary</button>
+    <%end%>    
   </div>
 </div>
 

From 2703c3c37a8614afe840fe62780a637e17faf216 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 11:39:37 +0630
Subject: [PATCH 07/18] add printer lists of system

---
 app/models/printer/printer_worker.rb                | 4 ++--
 app/views/print_settings/_form.html.erb             | 2 +-
 app/views/settings/cashier_terminals/_form.html.erb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/printer/printer_worker.rb b/app/models/printer/printer_worker.rb
index ad844cfe..c0485187 100755
--- a/app/models/printer/printer_worker.rb
+++ b/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
 
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index 38e55330..b8804dcc 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/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 %>
diff --git a/app/views/settings/cashier_terminals/_form.html.erb b/app/views/settings/cashier_terminals/_form.html.erb
index cb4014dd..d5693561 100755
--- a/app/views/settings/cashier_terminals/_form.html.erb
+++ b/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 %>

From 468914fb3c4b3da8c6363b7be892b97ac26292df Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 11:44:21 +0630
Subject: [PATCH 08/18] add printer lists in settings/oqs

---
 app/views/settings/order_queue_stations/_form.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/settings/order_queue_stations/_form.html.erb b/app/views/settings/order_queue_stations/_form.html.erb
index 86ca2237..0ffa8f9a 100755
--- a/app/views/settings/order_queue_stations/_form.html.erb
+++ b/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 %>

From 2837e4dd405c3d1dd4ddb47b84a4e29952065aff Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 13:22:58 +0630
Subject: [PATCH 09/18] check booking in movetable

---
 app/views/origami/movetable/move_dining.html.erb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/views/origami/movetable/move_dining.html.erb b/app/views/origami/movetable/move_dining.html.erb
index 01be4bb3..131407f0 100755
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/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 "" %>

From 7c6fedebe9786f0e2b7d5e8cb0f13123e71aae24 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 13:33:29 +0630
Subject: [PATCH 10/18] update open print service

---
 app/controllers/oqs/edit_controller.rb  | 20 +++---
 app/controllers/oqs/print_controller.rb | 94 +++++++++++++------------
 app/models/order_queue_station.rb       | 68 ++++++++++--------
 3 files changed, 99 insertions(+), 83 deletions(-)

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 368255e5..0130d823 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -16,15 +16,17 @@ class Oqs::EditController < BaseOqsController
     order_item.remark = remarks
     order_item.save
 
-    # print
-    # assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
-    # # order queue stations
-    # oqs = assigned_item.order_queue_station
-    
-    # unique_code="OrderItemPdf"    
+    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      # print
+      assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
+      # order queue stations
+      oqs = assigned_item.order_queue_station
+      
+      unique_code="OrderItemPdf"    
 
-    # print_settings=PrintSetting.find_by_unique_code(unique_code)
-    # order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    # order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
+      print_settings=PrintSetting.find_by_unique_code(unique_code)
+      order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+      order_queue_printer.print_order_item(print_settings, oqs, order_item.order_id, order_items_id, print_status=" (Updated)" )
+    end
   end
 end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index cc5556e9..1ae8ee04 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -1,61 +1,65 @@
 class Oqs::PrintController < ApplicationController
   # Print Order Item
   def print
-  	# unique_code="OrderItemPdf"
-  	# assigned_item_id = params[:id]
-   #  options = params[:options]
-   #  assigned_item = AssignedOrderItem.find(assigned_item_id)  	
-   #  assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      unique_code="OrderItemPdf"
+      assigned_item_id = params[:id]
+      options = params[:options]
+      assigned_item = AssignedOrderItem.find(assigned_item_id) 
+      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
-   #  # order queue stations
-   #  oqs = assigned_item.order_queue_station
-   #  order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
+      # order queue stations
+      oqs = assigned_item.order_queue_station
+      order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
 
-   #  # Check Printed
-   #  print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
+      # Check Printed
+      print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
 
-   #  # print when complete click 
-  	# print_settings = PrintSetting.find_by_unique_code(unique_code)
-   #  order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-  	# order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
-  	
-   #  # update print status for completed same order items
-   #  assigned_items.each do |ai|
-   #    ai.print_status=true
-   #    ai.save       
-   #  end                 
+      # print when complete click 
+      print_settings = PrintSetting.find_by_unique_code(unique_code)
+      order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
+      order_queue_printer.print_order_item(print_settings,oqs, assigned_item.order_id, order_item.order_items_id, print_status, options )
+      
+      # update print status for completed same order items
+      assigned_items.each do |ai|
+        ai.print_status=true
+        ai.save       
+      end  
+    end               
   end
 
   # Print Order Details with booking id
   def print_order_summary
-    # unique_code="OrderSummaryPdf"
-    # assigned_item_id = params[:id]
-    # table_name = params[:table_name]
-    # assigned_item = AssignedOrderItem.find(assigned_item_id)    
-    # assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
+    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      unique_code="OrderSummaryPdf"
+      assigned_item_id = params[:id]
+      table_name = params[:table_name]
+      assigned_item = AssignedOrderItem.find(assigned_item_id)    
+      assigned_items = AssignedOrderItem.where("item_code='" + assigned_item.item_code + "' AND " + "order_id='" + assigned_item.order_id + "'");
 
-    # # order queue stations
-    # oqs = assigned_item.order_queue_station
+      # order queue stations
+      oqs = assigned_item.order_queue_station
 
-    # # Check Printed
-    # print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
+      # Check Printed
+      print_status = assigned_item.print_status == true ? " (Re-Print)" : ""
 
-    # # get dining
-    # # dining = DiningFacility.find_by_name(table_name);
-    # # booking = Booking.find_by_dining_facility_id(dining.id)
+      # get dining
+      # dining = DiningFacility.find_by_name(table_name);
+      # booking = Booking.find_by_dining_facility_id(dining.id)
 
-    # # Get Booking ID
-    # booking_id = BookingOrder.where("order_id='#{assigned_item.order_id}'").pluck(:booking_id)[0]
-    
-    # # print when complete click 
-    # print_settings = PrintSetting.find_by_unique_code(unique_code)
-    # order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
-    # order_queue_printer.print_booking_summary(print_settings,oqs, booking_id, print_status)
+      # Get Booking ID
+      booking_id = BookingOrder.where("order_id='#{assigned_item.order_id}'").pluck(:booking_id)[0]
+      
+      # print when complete click 
+      print_settings = PrintSetting.find_by_unique_code(unique_code)
+      order_queue_printer = Printer::OrderQueuePrinter.new(print_settings)
+      order_queue_printer.print_booking_summary(print_settings,oqs, booking_id, print_status)
 
-    #  # update print status for completed same order items
-    # assigned_items.each do |ai|
-    #   ai.print_status = true
-    #   ai.save       
-    # end              
+       # update print status for completed same order items
+      assigned_items.each do |ai|
+        ai.print_status = true
+        ai.save       
+      end
+    end              
   end
-end
+end
\ No newline at end of file
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 8b1d6d7d..7b6b7eac 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -14,6 +14,7 @@ class OrderQueueStation < ApplicationRecord
   validates_presence_of :station_name, :printer_name
 
   def process_order (order, table_id)    
+
     oqs_stations = OrderQueueStation.active
     dining=DiningFacility.find(table_id)    
     # oqpbz = OrderQueueProcessByZone.find_by_zone_id(dining.zone_id)
@@ -77,14 +78,23 @@ class OrderQueueStation < ApplicationRecord
               end
             end
           end
-
-          # if oqs.auto_print 
-          #   if oqs_order_items.length > 0     
-          #     print_slip(oqs, order, oqs_order_items)
-          #     is_auto_printed = true
-          #   end
-          # end 
-        end        
+ 
+          if oqs.auto_print 
+            if oqs_order_items.length > 0     
+              print_slip(oqs, order, oqs_order_items)
+              is_auto_printed = true
+            end
+          end 
+        end
+        # if oqs.id == oqpbz.order_queue_station_id          
+        #   # Auto Printing
+        #   if oqs.auto_print 
+        #     if oqs_order_items.length > 0     
+        #       print_slip(oqs, order, oqs_order_items)
+        #       is_auto_printed = true
+        #     end
+        #   end 
+        # end  
       end   
     # end
   end
@@ -92,32 +102,32 @@ class OrderQueueStation < ApplicationRecord
   private
   #Print order_items in 1 slip
   def print_slip(oqs, order, order_items)    
-    # unique_code="OrderSummaryPdf"     
-    
-    # print_settings=PrintSetting.find_by_unique_code(unique_code)
-    # order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    # order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
+    unique_code="OrderSummaryPdf"
+    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
 
-    # AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
-    # # update print status for order items
-    #   ai.print_status=true
-    #   ai.save       
-    # end      
+    AssignedOrderItem.where("order_id = '#{ order.order_id }'").find_each do |ai|
+    # update print status for order items
+      ai.print_status=true
+      ai.save       
+    end  
+    
   end
 
   #Print order_item in 1 slip per item
   def print_slip_item(oqs, assigned_item)
-    # unique_code="OrderItemPdf"    
-    # order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
-    # # print when complete click 
-    # print_settings=PrintSetting.find_by_unique_code(unique_code)
-    # order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
-    # order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
+    unique_code="OrderItemPdf"    
+    order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
+    # print when complete click 
+    print_settings=PrintSetting.find_by_unique_code(unique_code)
+    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+    order_queue_printer.print_order_item(print_settings, oqs,item.order_id, order_item.order_items_id, print_status="" )
     
-    # # update print status for completed same order items
-    # assigned_order_item.each do |ai|
-    #   ai.print_status=true
-    #   ai.save       
-    # end
+    # update print status for completed same order items
+    assigned_order_item.each do |ai|
+      ai.print_status=true
+      ai.save       
+    end
   end
 end

From f2daaae8018c6d9c8511ac4b52a5d0634ec3289e Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 14:13:01 +0630
Subject: [PATCH 11/18] update control payment multiple

---
 app/models/order_queue_station.rb        | 2 +-
 app/views/origami/payments/show.html.erb | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 7b6b7eac..ae6c877e 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -78,7 +78,7 @@ class OrderQueueStation < ApplicationRecord
               end
             end
           end
- 
+          
           if oqs.auto_print 
             if oqs_order_items.length > 0     
               print_slip(oqs, order, oqs_order_items)
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 97c4d216..ff155525 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -316,14 +316,15 @@
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
           
           if (member_id && member_discount) {
+
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
               $("#credit_payment").hide();             
             } else{
               $("#credit_payment").show();
             }
 
-            if(parseInt(jQuery.inArray("MPU", payment_type)) > 0 || parseInt(jQuery.inArray("VISA", payment_type)) > 0 || parseInt(jQuery.inArray("JCB", payment_type)) > 0 || parseInt(jQuery.inArray("Master", payment_type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) > 0 || parseInt(jQuery.inArray("Redeem", payment_type)) > 0){
-              $("#card_payment").show();      
+            if(parseInt(jQuery.inArray("MPU", payment_type)) !=-1 || parseInt(jQuery.inArray("VISA", payment_type)) !=-1 || parseInt(jQuery.inArray("JCB", payment_type)) !=-1 || parseInt(jQuery.inArray("Master", payment_type)) !=-1 || parseInt(jQuery.inArray("UNIONPAY", payment_type)) !=-1 || parseInt(jQuery.inArray("Redeem", payment_type)) !=-1){
+              $("#card_payment").show();   
             } else{
              $("#card_payment").hide();
             }

From 5a5f47c94679e37140f52991cb62c19cc6b43598 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 14:21:50 +0630
Subject: [PATCH 12/18] add order_slim_pdf in settings/lookups and change
 order_slim_pdf

---
 README.md                                 | 13 +++--
 app/controllers/oqs/edit_controller.rb    |  9 +++-
 app/controllers/oqs/print_controller.rb   | 14 ++++++
 app/models/order_queue_station.rb         | 18 ++++++-
 app/models/printer/order_queue_printer.rb | 58 ++++++++++++++++++++---
 app/models/printer/receipt_printer.rb     | 36 ++++++++++++++
 6 files changed, 134 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index ec64ef45..ec82b44a 100755
--- a/README.md
+++ b/README.md
@@ -44,11 +44,14 @@ For Extra Time
 For Order Item & Order Summary Slim
 	*** change OrderItemPdf to OrderItemSlimPdf and OrderSummaryPdf to OrderSummarySlimPdf
 	1) settings/print_settings
-	2) app/controllers/oqs/edit_controller.rb
-	3) app/controllers/oqs/print_controller.rb
-	4) app/models/order_queue_station.rb
-	5) app/models/printer/order_queue_printer.rb
-	6) app/models/printer/receipt_printer.rb
+	2) settings/lookups => { type:order_slim_pdf, name:OrderSlimPdf, value:1 }
+	* no need to change these page
+	{ app/controllers/oqs/edit_controller.rb
+	  app/controllers/oqs/print_controller.rb
+	  app/models/order_queue_station.rb
+	  app/models/printer/order_queue_printer.rb
+	  app/models/printer/receipt_printer.rb
+	}
 
 For Bank Integration setting
   1) rake db:migrate for card_sale_trans, card_settle_trans
diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 0130d823..08ce6709 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -21,8 +21,15 @@ class Oqs::EditController < BaseOqsController
       assigned_item = AssignedOrderItem.find_by_instance_code(order_item.item_instance_code)    
       # order queue stations
       oqs = assigned_item.order_queue_station
+
+      order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       
-      unique_code="OrderItemPdf"    
+      unique_code="OrderItemPdf"
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'
+          unique_code="OrderItemSlimPdf"
+        end
+      end
 
       print_settings=PrintSetting.find_by_unique_code(unique_code)
       order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index 1ae8ee04..6f3afbd5 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -2,7 +2,14 @@ class Oqs::PrintController < ApplicationController
   # Print Order Item
   def print
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       unique_code="OrderItemPdf"
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'
+          unique_code="OrderItemSlimPdf"
+        end
+      end
+      
       assigned_item_id = params[:id]
       options = params[:options]
       assigned_item = AssignedOrderItem.find(assigned_item_id) 
@@ -31,7 +38,14 @@ class Oqs::PrintController < ApplicationController
   # Print Order Details with booking id
   def print_order_summary
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
+      order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       unique_code="OrderSummaryPdf"
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'
+          unique_code="OrderSummarySlimPdf"
+        end
+      end
+
       assigned_item_id = params[:id]
       table_name = params[:table_name]
       assigned_item = AssignedOrderItem.find(assigned_item_id)    
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index 7b6b7eac..fee3f9ea 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -101,8 +101,15 @@ class OrderQueueStation < ApplicationRecord
 
   private
   #Print order_items in 1 slip
-  def print_slip(oqs, order, order_items)    
+  def print_slip(oqs, order, order_items)
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf  
     unique_code="OrderSummaryPdf"
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[0][1] == '1'
+        unique_code="OrderSummarySlimPdf"
+      end
+    end  
+
     print_settings=PrintSetting.find_by_unique_code(unique_code)
     order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
     order_queue_printer.print_order_summary(print_settings, oqs,order.order_id, order_items, print_status="")
@@ -117,7 +124,14 @@ class OrderQueueStation < ApplicationRecord
 
   #Print order_item in 1 slip per item
   def print_slip_item(oqs, assigned_item)
-    unique_code="OrderItemPdf"    
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    unique_code="OrderItemPdf"
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[0][1] == '1'
+        unique_code="OrderItemSlimPdf"
+      end
+    end  
+
     order_item = OrderItem.where("order_id='#{assigned_item.order_id}' AND item_instance_code='#{assigned_item.instance_code}'").first()
     # print when complete click 
     print_settings=PrintSetting.find_by_unique_code(unique_code)
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index cc08f9ba..4a6dd0ed 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -14,9 +14,19 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
     filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+    
     # check for item not to show 
     # if order_item[0].price != 0 
-      pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'
+          pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+        else
+          pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+        end
+      else
+          pdf = OrderItemPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
+      end
       pdf.render_file filename    
 
       if oqs.print_copy
@@ -43,6 +53,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       print_settings.save!
     end 
 
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+
     order=print_query('order_summary', order_id)    
     # For Print Per Item
     if oqs.cut_per_item
@@ -55,7 +67,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+          if !order_slim_pdf.nil?
+            if order_slim_pdf[0][1] == '1'
+              pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+            else
+              pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+            end
+          else
+            pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
+          end
           # pdf.render_file "tmp/order_item.pdf"
           pdf.render_file filename
           if oqs.print_copy               
@@ -71,7 +91,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'
+          pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+        else
+          pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+        end
+      else  
+        pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
+      end
       pdf.render_file filename
       if oqs.print_copy
         self.print(filename, oqs.printer_name)        
@@ -94,6 +122,8 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       print_settings.save!
     end 
 
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
+
     order=print_query('booking_summary', booking_id)
     # For Print Per Item
     if oqs.cut_per_item
@@ -104,7 +134,15 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+          if !order_slim_pdf.nil?
+            if order_slim_pdf[0][1] == '1'
+              pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+            else
+              pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+            end
+          else
+              pdf = OrderItemPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
+          end
           pdf.render_file filename               
 
           if oqs.print_copy
@@ -122,8 +160,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       end
     # For Print Order Summary
     else      
-      filename = "tmp/booking_summary_#{booking_id}" + ".pdf"      
-      pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+      filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
+      if !order_slim_pdf.nil?
+        if order_slim_pdf[0][1] == '1'   
+          pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+        else
+          pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+        end
+      else  
+        pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
+      end
       pdf.render_file filename
       if oqs.print_copy
         self.print(filename, oqs.printer_name)
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index ed4fad91..ec7ad601 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -4,7 +4,13 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     pdf = OrderItemPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[0][1] == '1'
+        pdf = OrderItemSlimPdf.new
+      end
+    end
     pdf.render_file "tmp/order_item_queue_#{order_id}_#{order_item_id}" + ".pdf"
     self.print("tmp/receipt.pdf")
   end
@@ -14,7 +20,13 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Generate PDF
     #Print
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     pdf = OrderSummaryPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[1] == '1'
+        pdf = OrderSummarySlimPdf.new
+      end
+    end
     pdf.render_file filename
 
     self.print(filename)
@@ -24,8 +36,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[1] == '1'
+        pdf = OrderSummarySlimPdf.new
+      end
+    end
     pdf.render_file filename
 
     self.print(filename)
@@ -35,8 +53,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[1] == '1'
+        pdf = OrderSummarySlimPdf.new
+      end
+    end
     pdf.render_file filename
 
     self.print(filename)
@@ -46,8 +70,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[1] == '1'
+        pdf = OrderSummarySlimPdf.new
+      end
+    end
     pdf.render_file filename
 
     self.print(filename)
@@ -57,8 +87,14 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Use CUPS service
     #Generate PDF
     #Print
+    order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
+    if !order_slim_pdf.nil?
+      if order_slim_pdf[1] == '1'
+        pdf = OrderSummarySlimPdf.new
+      end
+    end
     pdf.render_file filename
 
     self.print(filename)

From 7fadeeed2e57319a3844b7f975b44adafb37ad9b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 14:32:24 +0630
Subject: [PATCH 13/18] update suppervisor ability and room & table first bill

---
 app/models/ability.rb                 | 1 +
 app/views/origami/home/show.html.erb  | 2 +-
 app/views/origami/rooms/show.html.erb | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index d3082a1b..8877fc61 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -165,6 +165,7 @@ class Ability
         can :create, :discount
         can :remove_discount_items, :discount
         can :remove_all_discount, :discount
+        can :member_discount, :discount
 
         can :manage, Customer
         can :manage, DiningQueue
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 372efa83..91f25ad2 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -605,7 +605,7 @@
         var sale_id = $('#sale_id').val();
           type = $('.payment_method').val();
           if(parseInt(jQuery.inArray("Credit", type)) == -1){
-            if (parseInt(jQuery.inArray("MPU", type)) > 0 || parseInt(jQuery.inArray("VISA", type)) > 0 || parseInt(jQuery.inArray("JCB", type)) > 0 || parseInt(jQuery.inArray("Master", type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", type)) > 0 || parseInt(jQuery.inArray("Redeem", type)) > 0) {
+            if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
                calculate_member_discount(sale_id,"Card");
                
             }else{
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 00350f1b..af581777 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -608,7 +608,7 @@ $(".choose_payment").on('click', function () {
   var sale_id = $('#sale_id').val();
   type = $('.payment_method').val();
   if(parseInt(jQuery.inArray("Credit", type)) == -1){
-    if (parseInt(jQuery.inArray("MPU", type)) > 0 || parseInt(jQuery.inArray("VISA", type)) > 0 || parseInt(jQuery.inArray("JCB", type)) > 0 || parseInt(jQuery.inArray("Master", type)) > 0 || parseInt(jQuery.inArray("UNIONPAY", type)) > 0 || parseInt(jQuery.inArray("Redeem", type)) > 0) {
+    if (parseInt(jQuery.inArray("MPU", type)) != -1 || parseInt(jQuery.inArray("VISA", type)) != -1 || parseInt(jQuery.inArray("JCB", type)) != -1 || parseInt(jQuery.inArray("Master", type)) != -1 || parseInt(jQuery.inArray("UNIONPAY", type)) != -1 || parseInt(jQuery.inArray("Redeem", type)) != -1) {
       calculate_member_discount(sale_id,"Card");
 
     }else{

From d8c62b0d44bab8f954f570c6f30584f2caf1e285 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 14:55:33 +0630
Subject: [PATCH 14/18] change and check order_slim_pdf

---
 app/controllers/oqs/edit_controller.rb    |  2 +-
 app/controllers/oqs/print_controller.rb   |  5 +++--
 app/models/order_queue_station.rb         |  4 ++--
 app/models/printer/order_queue_printer.rb | 10 +++++-----
 app/models/printer/receipt_printer.rb     | 22 +++++++++++-----------
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/app/controllers/oqs/edit_controller.rb b/app/controllers/oqs/edit_controller.rb
index 08ce6709..53a6bf53 100755
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -25,7 +25,7 @@ class Oqs::EditController < BaseOqsController
       order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       
       unique_code="OrderItemPdf"
-      if !order_slim_pdf.nil?
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'
           unique_code="OrderItemSlimPdf"
         end
diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index 6f3afbd5..2007934c 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -4,7 +4,8 @@ class Oqs::PrintController < ApplicationController
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       unique_code="OrderItemPdf"
-      if !order_slim_pdf.nil?
+      
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'
           unique_code="OrderItemSlimPdf"
         end
@@ -40,7 +41,7 @@ class Oqs::PrintController < ApplicationController
     if ENV["SERVER_MODE"] != "cloud" #no print in cloud server
       order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
       unique_code="OrderSummaryPdf"
-      if !order_slim_pdf.nil?
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'
           unique_code="OrderSummarySlimPdf"
         end
diff --git a/app/models/order_queue_station.rb b/app/models/order_queue_station.rb
index fee3f9ea..6f2fb04c 100755
--- a/app/models/order_queue_station.rb
+++ b/app/models/order_queue_station.rb
@@ -104,7 +104,7 @@ class OrderQueueStation < ApplicationRecord
   def print_slip(oqs, order, order_items)
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf  
     unique_code="OrderSummaryPdf"
-    if !order_slim_pdf.nil?
+    if !order_slim_pdf.empty?
       if order_slim_pdf[0][1] == '1'
         unique_code="OrderSummarySlimPdf"
       end
@@ -126,7 +126,7 @@ class OrderQueueStation < ApplicationRecord
   def print_slip_item(oqs, assigned_item)
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     unique_code="OrderItemPdf"
-    if !order_slim_pdf.nil?
+    if !order_slim_pdf.empty?
       if order_slim_pdf[0][1] == '1'
         unique_code="OrderItemSlimPdf"
       end
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 4a6dd0ed..3bd2df4c 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -18,7 +18,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     
     # check for item not to show 
     # if order_item[0].price != 0 
-      if !order_slim_pdf.nil?
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'
           pdf = OrderItemSlimPdf.new(print_settings,order_item[0], print_status, options, oqs.use_alternate_name)
         else
@@ -67,7 +67,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          if !order_slim_pdf.nil?
+          if !order_slim_pdf.empty?
             if order_slim_pdf[0][1] == '1'
               pdf = OrderItemSlimPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
             else
@@ -91,7 +91,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/order_summary_#{order_id}" + ".pdf"
-      if !order_slim_pdf.nil?
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'
           pdf = OrderSummarySlimPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
         else
@@ -134,7 +134,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
         # check for item not to show 
         #if odi.price != 0
-          if !order_slim_pdf.nil?
+          if !order_slim_pdf.empty?
             if order_slim_pdf[0][1] == '1'
               pdf = OrderItemSlimPdf.new(print_settings,odi, print_status, options,oqs.use_alternate_name)             
             else
@@ -161,7 +161,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Order Summary
     else      
       filename = "tmp/booking_summary_#{booking_id}" + ".pdf"   
-      if !order_slim_pdf.nil?
+      if !order_slim_pdf.empty?
         if order_slim_pdf[0][1] == '1'   
           pdf = OrderSummarySlimPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
         else
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index ec7ad601..a1375204 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -6,7 +6,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Print
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     pdf = OrderItemPdf.new
-    if !order_slim_pdf.nil?
+    if !order_slim_pdf.empty?
       if order_slim_pdf[0][1] == '1'
         pdf = OrderItemSlimPdf.new
       end
@@ -22,8 +22,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     pdf = OrderSummaryPdf.new
-    if !order_slim_pdf.nil?
-      if order_slim_pdf[1] == '1'
+    if !order_slim_pdf.empty?
+      if order_slim_pdf[0][1] == '1'
         pdf = OrderSummarySlimPdf.new
       end
     end
@@ -39,8 +39,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
-    if !order_slim_pdf.nil?
-      if order_slim_pdf[1] == '1'
+    if !order_slim_pdf.empty?
+      if order_slim_pdf[0][1] == '1'
         pdf = OrderSummarySlimPdf.new
       end
     end
@@ -56,8 +56,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
-    if !order_slim_pdf.nil?
-      if order_slim_pdf[1] == '1'
+    if !order_slim_pdf.empty?
+      if order_slim_pdf[0][1] == '1'
         pdf = OrderSummarySlimPdf.new
       end
     end
@@ -73,8 +73,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
-    if !order_slim_pdf.nil?
-      if order_slim_pdf[1] == '1'
+    if !order_slim_pdf.empty?
+      if order_slim_pdf[0][1] == '1'
         pdf = OrderSummarySlimPdf.new
       end
     end
@@ -90,8 +90,8 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     order_slim_pdf = Lookup.collection_of("order_slim_pdf") #order_slim_pdf
     filename = "tmp/order_summary_#{booking_id}" + ".pdf"
     pdf = OrderSummaryPdf.new
-    if !order_slim_pdf.nil?
-      if order_slim_pdf[1] == '1'
+    if !order_slim_pdf.empty?
+      if order_slim_pdf[0][1] == '1'
         pdf = OrderSummarySlimPdf.new
       end
     end

From bc2d6e07f10e676d867b1d663728f592801d52dd Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 16 Jan 2018 14:59:47 +0630
Subject: [PATCH 15/18] check empty for checkout time and checkout alert time

---
 app/controllers/api/check_in_process_controller.rb     | 2 +-
 app/controllers/origami/check_in_process_controller.rb | 2 +-
 app/models/dining_facility.rb                          | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 7ad00d67..883fb1ea 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -15,7 +15,7 @@ class Api::CheckInProcessController < Api::ApiController
 
 				lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
 				alert_time_min = 0
-				if !lookup_checkout_time.nil?
+				if !lookup_checkout_time.empty?
 					now = Time.now.utc
 			        lookup_checkout_time.each do |checkout_time|
 			          arr_time = checkout_time[0].split("-")
diff --git a/app/controllers/origami/check_in_process_controller.rb b/app/controllers/origami/check_in_process_controller.rb
index 40a28398..14d5c90c 100644
--- a/app/controllers/origami/check_in_process_controller.rb
+++ b/app/controllers/origami/check_in_process_controller.rb
@@ -3,7 +3,7 @@ class Origami::CheckInProcessController < BaseOrigamiController
 	def check_in_process
 		lookup_checkout_time = Lookup.collection_of("checkout_time")
 		checkout_at = Time.now.utc
-		if !lookup_checkout_time.nil?
+		if !lookup_checkout_time.empty?
 			lookup_checkout_time.each do |checkout_time|
 				arr_time = checkout_time[0].split("-")
 				start_time = Time.parse(arr_time[0].strip).utc.strftime("%H:%M%p")
diff --git a/app/models/dining_facility.rb b/app/models/dining_facility.rb
index 1feab5d9..c4da3475 100755
--- a/app/models/dining_facility.rb
+++ b/app/models/dining_facility.rb
@@ -80,7 +80,7 @@ class DiningFacility < ApplicationRecord
     if booking
       lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
       free_time_min = 0
-      if !lookup_checkout_time.nil?
+      if !lookup_checkout_time.empty?
         now = Time.now.utc
         lookup_checkout_time.each do |checkout_time|
           arr_time = checkout_time[0].split("-")
@@ -119,7 +119,7 @@ class DiningFacility < ApplicationRecord
     if bookings
       lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
       free_time_min = 0
-      if !lookup_checkout_time.nil?
+      if !lookup_checkout_time.empty?
         now = Time.now.utc
         lookup_checkout_time.each do |checkout_time|
           arr_time = checkout_time[0].split("-")

From d5b42b0ff0c5ccde990c85e0a6c835cb665eb69b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 17:19:14 +0630
Subject: [PATCH 16/18] update cable for cloud

---
 app/views/origami/payments/show.html.erb | 5 +++--
 config/routes.rb                         | 5 ++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index ff155525..96f69da9 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -312,9 +312,10 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
 
-        payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+        payment_type = '';
+        
         if ($("#server_mode").val() != "cloud") { // first bill not used in cloud
-          
+          payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
           if (member_id && member_discount) {
 
             if(parseInt(jQuery.inArray("Credit", payment_type)) == -1){
diff --git a/config/routes.rb b/config/routes.rb
index a31dcb5c..7fe033a0 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,10 @@ scope "(:locale)", locale: /en|mm/ do
   mount Sidekiq::Web => '/kiq'
 
   # Action Cable Creation
-   mount ActionCable.server => "/cable"
+  if ENV["SERVER_MODE"] !=  "cloud"
+    mount ActionCable.server => "/cable"
+  end
+   
 
   #--------- SmartSales Activation ------------#
   get 'activate' => 'install#index'

From 21a39dc390e86d51bbe353300dfec4c391a22322 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 16 Jan 2018 17:39:46 +0630
Subject: [PATCH 17/18] update route cable

---
 config/routes.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/routes.rb b/config/routes.rb
index 7fe033a0..73f37207 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,9 +7,9 @@ scope "(:locale)", locale: /en|mm/ do
   mount Sidekiq::Web => '/kiq'
 
   # Action Cable Creation
-  if ENV["SERVER_MODE"] !=  "cloud"
+  # if ENV["SERVER_MODE"] !=  "cloud"
     mount ActionCable.server => "/cable"
-  end
+  # end
    
 
   #--------- SmartSales Activation ------------#

From 93969822619b8f3a857410337db48c5fbb6950dd Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 17 Jan 2018 10:39:46 +0630
Subject: [PATCH 18/18] update sale item price 0

---
 app/models/sale.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index e0918d5f..33ef6149 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -665,7 +665,8 @@ def self.get_item_query()
                      # "JOIN employee_accesses ea ON ea.`employee_id` = sales.cashier_id ")
   query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
   # query = query.where("i.item_instance_code IS NOT NULL")
-  query = query.group("acc.title,mi.account_id,i.product_name").order("acc.title desc, mi.account_id desc")
+  query = query.group("acc.title,mi.account_id,i.product_name")
+               .order("acc.title desc, mi.account_id desc, i.unit_price asc")
 end
 
 def self.get_other_charges()