From fb5374149fc1bf226c38623f6604ab64bb088cc2 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 15 Dec 2017 09:56:36 +0630
Subject: [PATCH 01/84] change checkin booking color js

---
 .../javascripts/channels/check_in_booking.js  | 10 ++++---
 app/assets/javascripts/channels/checkin.js    | 30 +++++++++----------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/channels/check_in_booking.js b/app/assets/javascripts/channels/check_in_booking.js
index 4f5300ee..18597f4d 100644
--- a/app/assets/javascripts/channels/check_in_booking.js
+++ b/app/assets/javascripts/channels/check_in_booking.js
@@ -5,10 +5,12 @@ App.checkin = App.cable.subscriptions.create('CheckInBookingChannel', {
 
   disconnected: function() {},
 
-  received: function(data) {                 
-     $('.table_'+data.table.id).removeClass('green');
-     $('.table_'+data.table.id).addClass('blue');
-     $('.new_text_'+data.table.id).removeClass('hide')
+  received: function(data) {    
+  	if($('.table_'+data.table.id).hasClass('green')){
+  		$('.table_'+data.table.id).removeClass('green');
+	    $('.table_'+data.table.id).addClass('blue');
+  	} 
+  	$('.new_text_'+data.table.id).removeClass('hide');
  }
 });
 
diff --git a/app/assets/javascripts/channels/checkin.js b/app/assets/javascripts/channels/checkin.js
index d4a71d5e..03159170 100644
--- a/app/assets/javascripts/channels/checkin.js
+++ b/app/assets/javascripts/channels/checkin.js
@@ -6,21 +6,21 @@ App.order = App.cable.subscriptions.create('CheckinChannel', {
   disconnected: function() {},
 
   received: function(data) {        	
-		$.each(data.table,function(key,value){      
-			if($('.table_'+value.table_id).hasClass('blue')){
-				$('.table_'+value.table_id).removeClass('blue');
-		    $('.table_'+value.table_id).addClass('orange');
-			}
-			else if($('.table_'+value.table_id).hasClass('red')){
-				$('.table_'+value.table_id).removeClass('red');
-		    $('.table_'+value.table_id).addClass('orange');
-			}
-      else {
-        $('.table_'+value.table_id).removeClass('green');
-        $('.table_'+value.table_id).addClass('orange');
-      }
-			$('.new_text_'+value.table_id).removeClass('hide');
-		});  		  
+	$.each(data.table,function(key,value){      
+		if($('.table_'+value.table_id).hasClass('blue')){
+			$('.table_'+value.table_id).removeClass('blue');
+	    	$('.table_'+value.table_id).addClass('orange');
+		}
+		else if($('.table_'+value.table_id).hasClass('red')){
+			$('.table_'+value.table_id).removeClass('red');
+	    	$('.table_'+value.table_id).addClass('orange');
+		}
+	    else {
+	        $('.table_'+value.table_id).removeClass('green');
+	        $('.table_'+value.table_id).addClass('orange');
+	   	}
+		$('.new_text_'+value.table_id).removeClass('hide');
+	});  		  
  }
 });
 

From 20ae953af253a29a50fff55e1fdec7e852915d2b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 15 Dec 2017 11:50:05 +0630
Subject: [PATCH 02/84] cahnge foc process

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

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 236606c6..56e18b25 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -187,7 +187,7 @@ class SalePayment < ApplicationRecord
     payment_status = false
 
     # add to sale item with foc
-    sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }'")
+    sale_items = SaleItem.where("sale_id='#{ self.sale.sale_id }' and remark is null")
     
     sale_items.each do|item|
       SaleItem.update_existing_item(item.qty, item, self.sale.sale_id, "foc", item.unit_price, item.price)
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index b2ffe0c3..286f86f3 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -497,7 +497,7 @@
 
             //$( "#loading_wrapper" ).hide();
             
-            if (cash > 0) {
+            if (cash >= 0) {
               swal({
                title: "Information!",
                text: 'Thank You !',

From 909bde979812435f590146ac482542d5ba7dbf61 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 15 Dec 2017 11:54:41 +0630
Subject: [PATCH 03/84] change top item

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

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 1598563f..29607c11 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -1107,7 +1107,7 @@ end
   def self.top_items(today)
     query = Sale.select("a.product_name as item_name, SUM(a.price) as item_total_price")
           .joins("JOIN sale_items as a ON a.sale_id = sales.sale_id")
-          .where("sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
+          .where("(a.qty > 0 and a.price > 0) and payment_status='paid' and sales.sale_status = 'completed' and DATE_FORMAT(sales.receipt_date,'%Y-%m-%d') = ?",today)
           .group("a.product_code")
           .order("SUM(a.qty) DESC")
           .first()

From c0170104c9c8773428c61eda4b95f8401782afa5 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 15 Dec 2017 13:57:54 +0630
Subject: [PATCH 04/84] update member discount for 5%

---
 README.md                                     |  2 +-
 .../origami/discounts_controller.rb           | 17 +++++++-----
 app/views/origami/jcb/index.html.erb          | 26 +++++++++----------
 app/views/origami/master/index.html.erb       | 24 ++++++++---------
 app/views/origami/mpu/index.html.erb          | 24 ++++++++---------
 app/views/origami/payments/show.html.erb      | 15 +++++++----
 app/views/origami/visa/index.html.erb         | 24 ++++++++---------
 7 files changed, 70 insertions(+), 62 deletions(-)

diff --git a/README.md b/README.md
index ef68d0b7..5ff1aeda 100755
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ ruby 2.4.1p111
 		
 	    Campaign Id       => {"campaign_type_id": 1}
 
-
+java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
 * ToDo list
 
diff --git a/app/controllers/origami/discounts_controller.rb b/app/controllers/origami/discounts_controller.rb
index f580a92f..1166a705 100755
--- a/app/controllers/origami/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -157,7 +157,11 @@ class Origami::DiscountsController < BaseOrigamiController
     is_card         = params[:is_card]
     sub_total       = params[:sub_total]
     sale            = Sale.find(sale_id)
-
+    if is_card == 'true'
+      is_card = true
+      else is_card.to_s == 'false'
+      is_card = false
+    end
     # Check for Card Payment
     is_card_payment = SalePayment.get_sale_payments_by_card(sale.sale_payments)
    
@@ -178,9 +182,7 @@ class Origami::DiscountsController < BaseOrigamiController
           end
         end 
       end
-
-      generic_customer_id = sale.customer.membership_id
-      account_no          = sale.customer.paypar_account_no
+      generic_customer_id = sale.customer.membership_id      
       receipt_no          = sale.receipt_no
       membership          = MembershipSetting.find_by_membership_type("paypar_url")
       memberaction        = MembershipAction.find_by_membership_type("member_discount")
@@ -188,12 +190,13 @@ class Origami::DiscountsController < BaseOrigamiController
       campaign_type_id    = memberaction.additional_parameter["campaign_type_id"]
       auth_token          = memberaction.auth_token.to_s
       url                 = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+      account_no = sale.customer.paypar_account_no rescue nil
 
       # Check for items for Paypar Cloud
       if acc_prices.length > 0
           begin
           response        = HTTParty.post(url, 
-                                  :body => { account_no: nil,
+                                  :body => { account_no: account_no,
                                             generic_customer_id:generic_customer_id ,
                                              campaign_type_id: campaign_type_id,
                                              receipt_no: receipt_no,
@@ -220,8 +223,8 @@ class Origami::DiscountsController < BaseOrigamiController
       else 
           response = {"status": false, "message": "You have no selected discount item" }
       end
-      puts "discountttttttttttt"
-      puts response.to_json
+      Rails.logger.debug "-------------- Member Discount Osaka ---------"
+      Rails.logger.debug response.to_json
       # Re-calc All Amount in Sale
       if response["status"] == true
           discount_amount   = response["discount_earned"]
diff --git a/app/views/origami/jcb/index.html.erb b/app/views/origami/jcb/index.html.erb
index e33d4936..c7cc79f9 100755
--- a/app/views/origami/jcb/index.html.erb
+++ b/app/views/origami/jcb/index.html.erb
@@ -162,19 +162,19 @@ $('#jcb_pay').on('click',function(){
 	var sale_id = "<%= @sale_id %>";
 	if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 		$(this).off("click");
-			//start member discount 5% by pay card	
-			var sub_total = $('#sub-total').text();
-			var member_id = $('#membership_id').text();
-			var member_discount = $('#member_discount').text();
-			if (member_id && member_discount) {
-				$.ajax({
-					type: "POST",
-					url: "/origami/" + sale_id + "/member_discount",
-					data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-	              // success:function(result){           
-	              // }
-	          });
-			}
+		  //start member discount 5% by pay card	
+			// var sub_total = $('#sub-total').text();
+			// var member_id = $('#membership_id').text();
+			// var member_discount = $('#member_discount').text();
+			// if (member_id && member_discount) {
+			// 	$.ajax({
+			// 		type: "POST",
+			// 		url: "/origami/" + sale_id + "/member_discount",
+			// 		data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+	        //       success:function(result){           
+	        //           }
+	        //         });
+			// }
 	    //end member discount
 	    $.ajax({type: "POST",
 	    	url: "<%= origami_payment_jcb_path  %>",
diff --git a/app/views/origami/master/index.html.erb b/app/views/origami/master/index.html.erb
index 7dfac224..94a9e7c8 100755
--- a/app/views/origami/master/index.html.erb
+++ b/app/views/origami/master/index.html.erb
@@ -160,18 +160,18 @@
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
       $(this).off("click");
       //start member discount 5% by pay card  
-      var sub_total = $('#sub-total').text();
-      var member_id = $('#membership_id').text();
-      var member_discount = $('#member_discount').text();
-      if (member_id && member_discount) {
-        $.ajax({
-          type: "POST",
-          url: "/origami/" + sale_id + "/member_discount",
-          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-                // success:function(result){           
-                // }
-              });
-      }
+        // var sub_total = $('#sub-total').text();
+        // var member_id = $('#membership_id').text();
+        // var member_discount = $('#member_discount').text();
+        // if (member_id && member_discount) {
+        //   $.ajax({
+        //     type: "POST",
+        //     url: "/origami/" + sale_id + "/member_discount",
+        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+        //           // success:function(result){           
+        //           // }
+        //         });
+        // }
       //end member discount
       $.ajax({type: "POST",
         url: "<%= origami_payment_master_path  %>",
diff --git a/app/views/origami/mpu/index.html.erb b/app/views/origami/mpu/index.html.erb
index 85ebdc6c..722cd548 100755
--- a/app/views/origami/mpu/index.html.erb
+++ b/app/views/origami/mpu/index.html.erb
@@ -163,18 +163,18 @@
 		if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
 			$(this).off("click");
 		//start member discount 5% by pay card	
-		var sub_total = $('#sub-total').text();
-		var member_id = $('#membership_id').text();
-		var member_discount = $('#member_discount').text();
-		if (member_id && member_discount) {
-			$.ajax({
-				type: "POST",
-				url: "/origami/" + sale_id + "/member_discount",
-				data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-	              // success:function(result){           
-	              // }
-	          });
-		}
+			// var sub_total = $('#sub-total').text();
+			// var member_id = $('#membership_id').text();
+			// var member_discount = $('#member_discount').text();
+			// if (member_id && member_discount) {
+			// 	$.ajax({
+			// 		type: "POST",
+			// 		url: "/origami/" + sale_id + "/member_discount",
+			// 		data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+		    //              success:function(result){           
+		    //              }
+		    //          });
+			// }
 	    //end member discount
 	         //Mpu Payment
 	         $.ajax({type: "POST",
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index b2ffe0c3..e236928c 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -389,11 +389,11 @@
       }else{
         $(this).off("click");
         var sale_id   = $('#sale_id').text();
-        var item_row  = $('.is_card');
+        // var item_row  = $('.is_card');
 
-        if (item_row.length < 1) {
+        // if (item_row.length < 1) {
           calculate_member_discount(sale_id);
-        }
+        // }
        
           //  payment
           var cash = $('#cash').text();
@@ -517,15 +517,20 @@
    var sub_total = $('#sub-total').text();
    var member_id = $('#membership_id').text();
    var member_discount = $('#member_discount').text();
+   var item_row  = $('.is_card');
 
    if (member_id && member_discount) {
+     if (item_row.length < 1) {
+       is_card = false
+     }else{
+      is_card = true
+     }
     $.ajax({
       type: "POST",
       url: "/origami/" + sale_id + "/member_discount",
-      data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':false },
+      data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
       async: false,
       success:function(result){ 
-
       }
     });
   }
diff --git a/app/views/origami/visa/index.html.erb b/app/views/origami/visa/index.html.erb
index d239e231..cf0bd605 100755
--- a/app/views/origami/visa/index.html.erb
+++ b/app/views/origami/visa/index.html.erb
@@ -162,18 +162,18 @@
     if(parseFloat(amount) <= parseFloat($("#validamount").attr("value")) && amount > 0){
       $(this).off("click");
       //start member discount 5% by pay card  
-      var sub_total = $('#sub-total').text();
-      var member_id = $('#membership_id').text();
-      var member_discount = $('#member_discount').text();
-      if (member_id && member_discount) {
-        $.ajax({
-          type: "POST",
-          url: "/origami/" + sale_id + "/member_discount",
-          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
-                // success:function(result){           
-                // }
-              });
-      }
+        // var sub_total = $('#sub-total').text();
+        // var member_id = $('#membership_id').text();
+        // var member_discount = $('#member_discount').text();
+        // if (member_id && member_discount) {
+        //   $.ajax({
+        //     type: "POST",
+        //     url: "/origami/" + sale_id + "/member_discount",
+        //     data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':true },
+        //            success:function(result){           
+        //            }
+        //         });
+        // }
       //end member discount
       $.ajax({type: "POST",
         url: "<%= origami_payment_visa_path  %>",

From 9a6c5fda130846033f20b0b03445078b82469a99 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 15 Dec 2017 15:15:29 +0630
Subject: [PATCH 05/84] change paid amount 0

---
 app/models/sale_payment.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 56e18b25..06499c24 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -350,9 +350,9 @@ class SalePayment < ApplicationRecord
       self.sale.save!
       table_update_status(sObj)
       
-      if paid_amount != "0.0"
+      # if paid_amount != "0.0"
         update_shift
-      end
+      # end
     end
   end
 

From 0ff76ca98ae859f5b4d9a0baebd3d85b14bce26a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 15 Dec 2017 15:15:40 +0630
Subject: [PATCH 06/84] update osaka discoun 5%

---
 app/views/origami/customers/index.html.erb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index e788a08f..03c73fea 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -32,7 +32,7 @@
                 <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
 
                  <input type="text" name="filter" style="margin-right:10px" id="search" placeholder="Search" class="form-control input-sm col-md-12">
-                 <input type="hidden" name="type" id="type" value="<%= @dining_facility.type %>">
+                 <!-- <input type="hidden" name="type" id="type" value="<%= @dining_facility.type %>"> -->
 
                </div>
                <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
@@ -423,13 +423,13 @@
         success: function(data) {
           if(data.status == true)
           {
-            var id       = $("#table_id").val()
-            var type     = $("#type").val()
+            var id       = $("#table_id").val();
+            var type     = $("#type").val();
             if (type=="Table") {
               window.location.href = '/origami/table/'+id
             }else{
-              window.location.href = '/origami/room/'+id
-            }
+             window.location.href = '/origami/room/'+id
+           }
           }else{
             swal("Alert!", "Record not found!", "error");
             location.reload();

From 0c83a3a8cecc3f14a9258c5a6cf5101e6da23984 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 15 Dec 2017 16:26:35 +0630
Subject: [PATCH 07/84] update sale item for sub qty and person

---
 app/models/sale.rb                        |  2 +-
 app/views/reports/saleitem/index.html.erb | 12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 29607c11..b97c529e 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -659,7 +659,7 @@ 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("i.product_name").order("mi.account_id asc","mi.menu_category_id asc")
+  query = query.group("i.product_name").order("mi.account_id desc")
 end
 
 def self.get_other_charges()
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 7fa72521..97ba9c3f 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -49,6 +49,7 @@
 							<% acc_arr = Array.new %>
 							<% cate_arr = Array.new %>	 
 
+							<% sub_qty = 0 %>
 							<% sub_total = 0 %>
 							<% other_sub_total = 0 %>
 							<% count = 0 %>
@@ -108,18 +109,23 @@
 									<td><%= sale.grand_total rescue '-' %></td>
 								</tr>
 								<!-- sub total -->
+
 								<% @menu_cate_count.each do |key,value| %>
 								<% if sale.menu_category_id == key %>
 
 								    <% count = count + 1 %>	
 								    <% sub_total += sale.grand_total %>
+								    <% sub_qty += sale.total_item %>
 									<% if count == value %>	
 										<tr>
-											<td colspan="5">&nbsp;</td>
+											<td colspan="3">&nbsp;</td>
+											<td><b>Total <%= sale.account_name %> Qty </b> </td>
+											<td><b><%= sub_qty %></b></td>
 											<td><%= t("views.right_panel.detail.sub_total") %></td>
 											<td ><span class="underline"><%= sub_total %></span></td>
 										</tr>
 										<% sub_total = 0.0%>
+										<% sub_qty = 0 %>
 										<% count = 0%>
 									<% end %>
 							      <% end %>
@@ -127,7 +133,7 @@
 							<!-- end sub total -->
 							<% end %>
 							<!--Other Charges -->
-							
+							<% if @other_charges.present? %>
 							   <tr>
 									<td><b>Other Charges</b></td>
 									<td colspan="4">&nbsp;</td>
@@ -157,7 +163,7 @@
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
 									<td ><span><%= other_sub_total %></span></td>
 								</tr>
-						
+						    <%end%>
 							<!-- End Other Charges -->
 							<tr style="border-top:2px solid grey;">
 								<td colspan="3">&nbsp;</td>

From 9f41be5c99e5ee5dca0de46f86fc08d1ba34c213 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 15 Dec 2017 17:55:02 +0630
Subject: [PATCH 08/84] upate call waiter print

---
 .../api/call_waiters_controller.rb            |  8 +++
 app/models/printer/receipt_printer.rb         | 11 +++
 app/pdf/call_waiter_pdf.rb                    | 71 +++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 app/pdf/call_waiter_pdf.rb

diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index 2c45bbbe..4bd07570 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -6,6 +6,14 @@ class Api::CallWaitersController < ActionController::API
     @time     = params[:time]
     @table    = DiningFacility.find(@table_id)
     CallWaiterJob.perform_later(@table,@time)
+
+    # get printer info
+    @shop          = Shop::ShopDetail 
+    unique_code    = "CallWaiterPdf" 
+    print_settings = PrintSetting.find_by_unique_code(unique_code)
+    printer        = Printer::ReceiptPrinter.new(print_settings)   
+    printer.print_call_waiter(print_settings,@table,@time,@shop)
+  
   end
 
   
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 78aa204e..adcb187e 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -117,4 +117,15 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
         pdf.render_file "tmp/print_crm_order.pdf"
     self.print("tmp/print_crm_order.pdf")
   end
+
+  #Queue No Print
+  def print_call_waiter(printer_settings,table,time,shop_detail)
+    #Use CUPS service
+    #Generate PDF
+    #Print
+    pdf = CallWaiterPdf.new(printer_settings,table,time,shop_detail)
+    pdf.render_file "tmp/print_call_waiter.pdf"
+    self.print("tmp/print_call_waiter.pdf")
+  end
+
 end
diff --git a/app/pdf/call_waiter_pdf.rb b/app/pdf/call_waiter_pdf.rb
new file mode 100644
index 00000000..a1ea756b
--- /dev/null
+++ b/app/pdf/call_waiter_pdf.rb
@@ -0,0 +1,71 @@
+class CallWaiterPdf < 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, table,time,shop_detail)
+    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
+
+    super(:margin => [self.margin, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    # db font setup
+    if printer_settings.font != ""
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        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)
+    stroke_horizontal_rule
+
+    # date_info(queue)
+
+  end
+
+  def header (shop_name, name)
+    text "#{shop_name}", :left_margin => -10, :size => self.header_font_size,:align => :center
+    text "#{name}", :size => self.header_font_size,:align => :center
+    # move_down self.item_height
+    move_down 5
+    stroke_horizontal_rule
+    move_down 5
+  end
+
+  def call_waiter (table)
+    move_down 3
+    text "Table Name : #{table.name}",:align => :center
+  end
+
+  # def date_info(queue)
+  #       move_down 5
+
+  #       y_position = cursor
+  #       bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
+  #           text "Date:", :size => self.item_font_size,:align => :left
+  #       end
+  #       bounding_box([self.label_width,y_position], :width => self.item_width) do
+  #           text "#{queue.created_at.strftime('%Y-%m-%d %I:%M %p')}" , :size => self.item_font_size,:align => :left
+  #       end
+
+  #       move_down 5
+        
+  # end
+
+end

From aec3b17127bbb88dae0f96b16a19fc181ea98fe0 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 15 Dec 2017 17:58:38 +0630
Subject: [PATCH 09/84] upate call waiter print

---
 app/controllers/api/call_waiters_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index 4bd07570..a778af12 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -8,11 +8,11 @@ class Api::CallWaitersController < ActionController::API
     CallWaiterJob.perform_later(@table,@time)
 
     # get printer info
-    @shop          = Shop::ShopDetail 
-    unique_code    = "CallWaiterPdf" 
-    print_settings = PrintSetting.find_by_unique_code(unique_code)
-    printer        = Printer::ReceiptPrinter.new(print_settings)   
-    printer.print_call_waiter(print_settings,@table,@time,@shop)
+    # @shop          = Shop::ShopDetail 
+    # unique_code    = "CallWaiterPdf" 
+    # print_settings = PrintSetting.find_by_unique_code(unique_code)
+    # printer        = Printer::ReceiptPrinter.new(print_settings)   
+    # printer.print_call_waiter(print_settings,@table,@time,@shop)
   
   end
 

From 368405451f8d00005534e618374b82b67de29079 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 19 Dec 2017 11:49:03 +0630
Subject: [PATCH 10/84] need to fix license

---
 app/controllers/application_controller.rb |  3 +-
 app/controllers/base_controller.rb        |  1 +
 app/models/license.rb                     | 38 ++++++++++++++++++++---
 config/license.yml                        |  7 ++---
 config/secrets.yml                        |  2 +-
 5 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index fcca34a7..93652e52 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -44,9 +44,8 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  def current_license(url)
+  def current_license(url)  
     @license = License.new(url)
-
     if (@license.detail_with_local_file() == true)
       puts "RUN SAY BYAR"
     else
diff --git a/app/controllers/base_controller.rb b/app/controllers/base_controller.rb
index 9f0914c4..1bf5b4d4 100755
--- a/app/controllers/base_controller.rb
+++ b/app/controllers/base_controller.rb
@@ -1,4 +1,5 @@
 class BaseController < ActionController::Base
   layout "installation"
   protect_from_forgery with: :exception
+  
 end
diff --git a/app/models/license.rb b/app/models/license.rb
index 0f2fd0ed..f5d7597a 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -69,11 +69,32 @@ class License
 
   # For Local System
   def detail_with_local_file()
-    has_license = true # verify_license()
+    aes = MyAesCrypt.new
+    aes_key, aes_iv = aes.export_key(lookup)
+    renewal_date_str = read_license("renewable_date")
 
-    if has_license
-      puts "VERIFIED"
+    # ##Check from local redis - if available load local otherwise get from remote
+    # renewable_date = "renewable_date:#{renewal_date_str}"
+
+    # ##Get redis connection from connection pool
+    # redis = Redis.new
+    # cache_renewable_date = redis.get(renewable_date)
+    # if cache_renewable_date.nil?
+    #   redis = Redis.new
+    #   redis.set(renewable_date, Marshal.dump(@license))
+    # else
+    #   get_renewable_date = Marshal.load(cache_renewable_date)
+    if check_expiring(renewal_date_str)    
+      return true
+    else
+      has_license = verify_license()
+
+      if has_license
+        puts "VERIFIED"
+        return true
+      end
     end
+    # end    
   end    
 
   # License Activation
@@ -115,6 +136,12 @@ class License
     return false  
   end
 
+  # Check Expired before 30 days
+  def check_expiring(renewal_date_str)
+    renewal_date = DateTime.parse(renewal_date_str)
+    renewal_date >  Date.today.advance(:days => 30)
+  end
+
   # Check License expired date from PROVISION SERVER
   def check_expired(renewal_date_str)
     renewal_date = DateTime.parse(renewal_date_str)
@@ -136,7 +163,7 @@ class License
     if File.exist?("config/license.yml")  
       File.open("config/license.yml").each do |line|
         if line.include? (key)
-          decrypted_line_array = line.split(": ")
+          decrypted_line_array = line.split(": ")          
           decrypted_line = AESCrypt.decrypt_data(decode_str(decrypted_line_array[1]), decode_str(ENV['AES_KEY']), decode_str(ENV['AES_IV']), ENV['CIPHER_TYPE'])
         end
       end
@@ -185,6 +212,9 @@ class License
           f.puts("dbpassword: #{response_data['dbpassword']}")
           f.puts("api_token: #{response_data['api_token']}")
           f.puts("app_token: #{response_data['app_token']}")  
+          f.puts("plan_sku: #{response_data['plan_sku']}")
+          f.puts("renewable_date: #{response_data['renewable_date']}")
+          f.puts("plan_name: #{response_data['plan_name']}")
         end          
       rescue IOError
          response = { "status": false, "message": "Activation is success but something is wrong. \n Please contact code2lab call center!"}
diff --git a/config/license.yml b/config/license.yml
index 4a5c6b90..b96a0256 100644
--- a/config/license.yml
+++ b/config/license.yml
@@ -10,7 +10,6 @@ dbusername: LapN+Geriht8yk866FxNiQ==
 dbpassword: QtboWZ4ATE05vvYw6J+Uqw==
 api_token: nGyMizHtoVEFYCjSVEFJuzkxuBJwSsH
 app_token: QUdPwSakcsnuVLdfkXgGHhPMiIOcSSfaVwQyA
-
-plan_sku: 001
-renewable_date: 2018-12-14
-plan_name: Community
+plan_sku: 9+83FZetcbLZi6COG5PbSw==
+renewable_date: shztSYIsNmM9nlHkR/4exQ==
+plan_name: LapN+Geriht8yk866FxNiQ==
diff --git a/config/secrets.yml b/config/secrets.yml
index 23c287ba..af242402 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -13,7 +13,7 @@
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
   sx_provision_url: 192.168.1.147:3002/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
-  server_mode: cloud
+  server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
   aes_key: <%= ENV['AES_KEY'] %>

From 4e616ed5eb51ad892d5497dfec72fe040ca57de5 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 19 Dec 2017 14:18:41 +0630
Subject: [PATCH 11/84] need to fix license

---
 app/models/license.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/models/license.rb b/app/models/license.rb
index f5d7597a..4ff507c1 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -69,8 +69,8 @@ class License
 
   # For Local System
   def detail_with_local_file()
-    aes = MyAesCrypt.new
-    aes_key, aes_iv = aes.export_key(lookup)
+    # aes = MyAesCrypt.new
+    # aes_key, aes_iv = aes.export_key(lookup)
     renewal_date_str = read_license("renewable_date")
 
     # ##Check from local redis - if available load local otherwise get from remote
@@ -163,7 +163,8 @@ class License
     if File.exist?("config/license.yml")  
       File.open("config/license.yml").each do |line|
         if line.include? (key)
-          decrypted_line_array = line.split(": ")          
+          decrypted_line_array = line.split(": ")   
+          byebug       
           decrypted_line = AESCrypt.decrypt_data(decode_str(decrypted_line_array[1]), decode_str(ENV['AES_KEY']), decode_str(ENV['AES_IV']), ENV['CIPHER_TYPE'])
         end
       end

From d7a3ba700400d12b626bf0741cfed1b247c416e3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 19 Dec 2017 16:01:45 +0630
Subject: [PATCH 12/84] change alert to swal in origami/Add to Existing

---
 app/views/origami/home/show.html.erb  | 14 +++++++++++---
 app/views/origami/rooms/show.html.erb | 16 ++++++++++++----
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 2946791f..22d909b9 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -491,7 +491,7 @@
                 window.location.href = '/origami/' + sale_id + '/other_charges'
             }
             else {
-                alert("Please select an table!");
+                swal ( "Oops" ,  "Please select an table!" ,  "warning" );
             }
 
             return false;
@@ -510,7 +510,7 @@
                 window.location.href = '/origami/' + sale_id + '/discount'
             }
             else {
-                alert("Please select an table!");
+              swal ( "Oops" ,  "Please select an table!" ,  "warning" );
             }
 
             return false;
@@ -584,8 +584,16 @@
             url: ajax_url,
             data: 'dining_id=' + dining_id + "&sale_id=" + sale_id,
             success: function (result) {
-                alert("Invoice updated")
+              swal({
+                title: "Information!",
+                text: "Invoice updated",
+                html: true,
+                closeOnConfirm: false,
+                closeOnCancel: false,
+                allowOutsideClick: false
+              }, function () {
                 window.location.reload();
+              });
             }
         });
     })
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 600eaf73..759a171c 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -498,7 +498,7 @@ $(document).ready(function(){
       window.location.href = '/origami/' + sale_id + '/discount'
     }
     else {
-      alert("Please select an table!");
+      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
     }
 
     return false;
@@ -517,7 +517,7 @@ $(document).ready(function(){
       window.location.href = '/origami/' + sale_id + '/other_charges'
     }
     else {
-      alert("Please select an table!");
+      swal ( "Oops" ,  "Please select an table!" ,  "warning" );
     }
 
     return false;
@@ -600,8 +600,16 @@ $('#add_invoice').on('click',function(){
       url: ajax_url,
       data: 'dining_id='+ dining_id + "&sale_id=" + sale_id,
       success:function(result){
-        alert("Invoice updated")
-        window.location.reload();
+        swal({
+          title: "Information!",
+          text: "Invoice updated",
+          html: true,
+          closeOnConfirm: false,
+          closeOnCancel: false,
+          allowOutsideClick: false
+        }, function () {
+          window.location.reload();
+        });
       }
   });
 });

From bba3aa763195cdd0decca95ac27e3b987228394f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 19 Dec 2017 16:27:00 +0630
Subject: [PATCH 13/84] update all report generate and excel

---
 app/pdf/order_item_pdf.rb                       | 6 +++---
 app/pdf/receipt_bill_pdf.rb                     | 6 +++---
 app/views/reports/credit_payment/index.html.erb | 5 ++++-
 app/views/reports/payment_method/index.html.erb | 5 ++++-
 app/views/reports/receipt_no/index.html.erb     | 5 ++++-
 app/views/reports/saleitem/index.html.erb       | 7 +++++--
 app/views/reports/shiftsale/index.html.erb      | 5 ++++-
 app/views/reports/void_sale/index.html.erb      | 5 ++++-
 8 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 4bc57878..e27fdaf5 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -40,7 +40,7 @@ class OrderItemPdf < Prawn::Document
 
     text "#{ order_item.type + '-' + order_item.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
     stroke_horizontal_rule
-    move_down 5
+    move_down 3
 
     #order_info
     order_info(order_item.order_id, order_item.order_by,order_item.order_at)
@@ -56,13 +56,13 @@ class OrderItemPdf < Prawn::Document
         text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
     end
 
-    move_down 5
+    move_down 2
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
         text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
     end
 
-    move_down 5
+    move_down 2
     y_position = cursor
     bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
         text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index dfd67d89..ede3fb26 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -4,7 +4,7 @@ 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)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
-    self.margin = 5
+    self.margin = 0
     self.price_width = 40
     self.qty_width = 20
     self.total_width = 40
@@ -20,7 +20,7 @@ class ReceiptBillPdf < Prawn::Document
     # @double = @qty_width * 1.3
     # @half_qty = @qty_width / 2
     #setting page margin and width
-    super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+    super(:margin => [20, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
     # db font setup
     if printer_settings.font != ""
@@ -74,7 +74,7 @@ class ReceiptBillPdf < Prawn::Document
   end
 
   def header (shop_details)
-    move_down 7
+    move_down 5
     text "#{shop_details.name}", :left_margin => -10, :size => self.header_font_size,:align => :center
     move_down 5
     text "#{shop_details.address}", :size => self.item_font_size,:align => :center
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 9037f03b..7c520fe3 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -123,7 +123,10 @@
 		
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-			
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			
 			var str = '';
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index 2407e50a..0c48fe22 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -189,7 +189,10 @@
 			var shift = $('#shift_name');
 			
 			shift.empty();
-			
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			var str = '';
 			var param_shift = '';	   
 			var param_shift = '<%= params[:shift_name] rescue '-'%>';
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index 00622069..e82c3e3c 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -196,7 +196,10 @@
 			var str = '';
 			var param_shift = '';	   
 			var param_shift = '<%= params[:shift_name] rescue '-'%>';
-
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			url = '<%= reports_get_shift_by_date_path %>';
 			
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index 97ba9c3f..d0def563 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -297,12 +297,15 @@
 
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			var selected = '';
 			var str = '';
 			var param_shift = '<%= params[:shift_name]%>';
-
+			
 			url = '<%= reports_get_shift_by_date_path %>';
 			$.get(url, {period :period, period_type :period_type, from :from, to :to, report_type :shift_item} , function(data){
 				console.log(data)
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 2aeac1e5..8138007d 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -191,7 +191,10 @@
 		
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-			
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 			
 			var str = '';
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb
index 3bc48410..045df74d 100755
--- a/app/views/reports/void_sale/index.html.erb
+++ b/app/views/reports/void_sale/index.html.erb
@@ -144,7 +144,10 @@
 
 		function show_shift_name(period,period_type,from,to,shift_item){
 			var shift = $('#shift_name');
-
+			if (from == '' && to == '') {
+				from = $("#from").val();
+	  		    to   = $("#to").val();
+			}
 			shift.empty();
 
 			var str = '';

From 3be8a56ac68678a8140d9980ea6949bb53b11769 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 19 Dec 2017 16:54:11 +0630
Subject: [PATCH 14/84] need to fix license

---
 app/controllers/application_controller.rb |  8 ++--
 app/models/license.rb                     | 58 +++++++++++++++++++----
 2 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 93652e52..d10fbbf5 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -46,10 +46,12 @@ class ApplicationController < ActionController::Base
 
   def current_license(url)  
     @license = License.new(url)
-    if (@license.detail_with_local_file() == true)
-      puts "RUN SAY BYAR"
+    if (@license.detail_with_local_file() == 0)
+      puts "Expired or No License!"
+    elsif (@license.detail_with_local_file() == 2)
+      puts "Expiring! pls, license extend..."
     else
-      return nil
+      puts "RUN SAY BYAR"
     end
   end
 
diff --git a/app/models/license.rb b/app/models/license.rb
index 4ff507c1..e9922084 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -69,8 +69,17 @@ class License
 
   # For Local System
   def detail_with_local_file()
-    # aes = MyAesCrypt.new
-    # aes_key, aes_iv = aes.export_key(lookup)
+    # flag = ENV["AES_KEY"]
+    # # Check Exists IV
+    # if flag == "<%= ENV['AES_IV'] %>"
+    #   # Export for Key  
+    #   aes = MyAesCrypt.new 
+    #   aes_key, aes_iv = aes.export_key(lookup)
+    # else      
+    #   aes_key = ENV["AES_KEY"]
+    #   aes_iv = ENV["AES_IV"]
+    # end
+
     renewal_date_str = read_license("renewable_date")
 
     # ##Check from local redis - if available load local otherwise get from remote
@@ -84,14 +93,17 @@ class License
     #   redis.set(renewable_date, Marshal.dump(@license))
     # else
     #   get_renewable_date = Marshal.load(cache_renewable_date)
-    if check_expiring(renewal_date_str)    
-      return true
+    if check_expiring(renewal_date_str)   
+      # return for all ok 
+      return 1
     else
       has_license = verify_license()
 
       if has_license
-        puts "VERIFIED"
-        return true
+        # return for expiring 
+        return 2
+      else
+        return 0
       end
     end
     # end    
@@ -144,7 +156,13 @@ class License
 
   # Check License expired date from PROVISION SERVER
   def check_expired(renewal_date_str)
+    expired_date_str = read_license("renewable_date")
+    expired_date = DateTime.parse(expired_date_str)
     renewal_date = DateTime.parse(renewal_date_str)
+    if(renewal_date != expired_date){
+      update_license("renewable_date", renewal_date_str)
+    }
+
     if (renewal_date < Date.today)
       return true
     else
@@ -163,8 +181,7 @@ class License
     if File.exist?("config/license.yml")  
       File.open("config/license.yml").each do |line|
         if line.include? (key)
-          decrypted_line_array = line.split(": ")   
-          byebug       
+          decrypted_line_array = line.split(": ")                   
           decrypted_line = AESCrypt.decrypt_data(decode_str(decrypted_line_array[1]), decode_str(ENV['AES_KEY']), decode_str(ENV['AES_IV']), ENV['CIPHER_TYPE'])
         end
       end
@@ -186,7 +203,32 @@ class License
     return decrypted_line
   end
 
+  # Update license file for line
+  def update_license(content, new_content)
+    if !new_content.include? "=="
+      str = encode_str(new_content)
+      crypted_str = AESCrypt.encrypt_data(str, ENV['AES_KEY'], ENV['AES_IV'], ENV['CIPHER_TYPE'])
+    end
+
+    content_str = read_license_no_decrypt(content)
+    if File.exist?("config/license.yml")  
+      file_str = File.read("config/license.yml")
+      new_file_str = file_str.gsub(content, crypted_str)
+
+      # To write changes to the file, use:
+      # File.open("config/license.yml", "w") {|file| file.puts new_file_str }
+      
+      # File.open("config/license.yml").each do |line|
+      #   new_file_str = line.gsub(content, crypted_str)
+      #   f.put
+      # end
+    end
+  end  
+
    private
+    def encode_str(str)
+      return Base64.encode64(str)
+    end
 
     def decode_str(str)
       return Base64.decode64(str)

From fce3785912e1b9c83b5da2e98dc2543c88e7fd64 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 20 Dec 2017 15:57:37 +0630
Subject: [PATCH 15/84] add order item and order summary slim pdf

---
 app/assets/javascripts/OQS.js                 |   7 +-
 .../channels/order_queue_station.js           |   4 +-
 app/models/printer/order_queue_printer.rb     |  10 +-
 app/models/sale_payment.rb                    |   8 +-
 app/pdf/order_item_pdf.rb                     |  20 ++-
 app/pdf/order_item_slim_pdf.rb                | 129 +++++++++++++++
 app/pdf/order_summary_pdf.rb                  |  12 +-
 app/pdf/order_summary_slim_pdf.rb             | 155 ++++++++++++++++++
 app/views/oqs/home/index.html.erb             |   4 +-
 config/routes.rb                              |   2 +-
 10 files changed, 321 insertions(+), 30 deletions(-)
 create mode 100644 app/pdf/order_item_slim_pdf.rb
 create mode 100644 app/pdf/order_summary_slim_pdf.rb

diff --git a/app/assets/javascripts/OQS.js b/app/assets/javascripts/OQS.js
index 64e207ab..6068b53f 100755
--- a/app/assets/javascripts/OQS.js
+++ b/app/assets/javascripts/OQS.js
@@ -61,7 +61,7 @@ $(document).on('turbolinks:load', function() {
 	            if (data[field]["options"] == "[]" || data[field]["options"] == "") {
 	             var options = "";
 	            }else{
-	             var options = data.options;
+	             var options = data[field]["options"];
 	            }
 
 	            var date = new Date(data[field]["created_at"]); 
@@ -80,7 +80,7 @@ $(document).on('turbolinks:load', function() {
 	                          +'<span class="order-qty"> [x'+ data[field]["qty"] +'] </span>'
 	                         +'</p>'
 
-	                        +'<p class="card-text item-options">'+ options +'</p>'
+	                        +'<br/><p class="card-text item-options">'+ options +'</p>'
 
 	                        +'<span class="card-text">'
 	                          +'<span class="text-muted">Order at - '
@@ -223,8 +223,9 @@ $(document).on('turbolinks:load', function() {
   		var params = { 'options':options };
 
   		$.ajax({
-			type: 'GET',
+			type: 'POST',
 	     	url: '/oqs/print/print/'+assigned_item_id,
+	     	data: params,
 	     	success: function(data){	}
   		});
   	});
diff --git a/app/assets/javascripts/channels/order_queue_station.js b/app/assets/javascripts/channels/order_queue_station.js
index a95a0eb6..d2b502d4 100755
--- a/app/assets/javascripts/channels/order_queue_station.js
+++ b/app/assets/javascripts/channels/order_queue_station.js
@@ -14,7 +14,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
   		if (items[field]["options"] == "[]" || items[field]["options"] == "") {
   			var options = "";
   		}else{
-  			var options = items.options;
+  			var options = items[field]["options"];
   		}
   		//for count
   		test = document.getElementsByClassName("oqs_count");
@@ -49,7 +49,7 @@ App.order_queue_station = App.cable.subscriptions.create('OrderQueueStationChann
            +'<span class="order-qty"> [x'+ items[field]["qty"] +'] </span>'
           +'</p>'
 
-		  		+'<p class="card-text item-options">'+ options +'</p>'
+		  		+'<br/><p class="card-text item-options">'+ options +'</p>'
 
 		  		+'<span class="card-text">'
             +'<span class="text-muted">Order at - '
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 495bf85a..499c718d 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -12,7 +12,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
 
     order_item =  print_query('order_item', order_item_id) #OrderItem.find_by_item_code(item_code)  
 
-    filename = "tmp/order_item.pdf" 
+    filename = "tmp/order_item_#{order_id}_#{order_item_id}" + ".pdf" 
 
     # check for item not to show 
     # if order_item[0].price != 0 
@@ -47,7 +47,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Per Item
     if oqs.cut_per_item
       order.each do|odi|
-        filename = "tmp/order_item.pdf"
+        filename = "tmp/order_item_#{order_id}" + ".pdf" 
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
 
@@ -68,7 +68,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       end
     # For Print Order Summary
     else      
-      filename = "tmp/order_summary.pdf"
+      filename = "tmp/order_summary_#{order_id}" + ".pdf"
       pdf = OrderSummaryPdf.new(print_settings,order, print_status, order_items, oqs.use_alternate_name)
       pdf.render_file filename
       if oqs.print_copy
@@ -96,7 +96,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     # For Print Per Item
     if oqs.cut_per_item
       order.each do|odi|
-        filename = "tmp/order_item.pdf"
+        filename = "tmp/order_item_#{booking_id}" + ".pdf"
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
 
@@ -120,7 +120,7 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
       end
     # For Print Order Summary
     else      
-      filename = "tmp/booking_summary.pdf"      
+      filename = "tmp/booking_summary_#{booking_id}" + ".pdf"      
       pdf = OrderSummaryPdf.new(print_settings,order, print_status,oqs.use_alternate_name)
       pdf.render_file filename
       if oqs.print_copy
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 06499c24..c4b4cee4 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -198,7 +198,7 @@ class SalePayment < ApplicationRecord
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-    sale_update_payment_status(self.received_amount)    
+    sale_update_payment_status(self.received_amount,1)    
 
     return payment_status
   end
@@ -290,7 +290,7 @@ class SalePayment < ApplicationRecord
 
   end
 
-  def sale_update_payment_status(paid_amount)    
+  def sale_update_payment_status(paid_amount,check_foc = 0)    
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
     self.sale.save!
@@ -350,9 +350,9 @@ class SalePayment < ApplicationRecord
       self.sale.save!
       table_update_status(sObj)
       
-      # if paid_amount != "0.0"
+      if paid_amount != "0.0" || check_foc > 0
         update_shift
-      # end
+      end
     end
   end
 
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index 4bc57878..f0b0cecb 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -105,18 +105,22 @@ class OrderItemPdf < Prawn::Document
     end
 
     if alt_name
-    move_down 4
-        font("public/fonts/NotoSansCJKtc-Regular.ttf") do
-            text "(#{order_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+        if !(order_item.alt_name).empty?
+            move_down 4
+            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+                text "(#{order_item.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+            end
         end
     end
 
-    move_down 5
+    if !options.empty?
+        move_down 5
 
-    # add option
-    y_position = cursor
-    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
-        text "#{options}", :size => self.item_font_size,:align => :left
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "#{options}", :size => self.item_font_size,:align => :left
+        end
     end
 
     move_down 5
diff --git a/app/pdf/order_item_slim_pdf.rb b/app/pdf/order_item_slim_pdf.rb
new file mode 100644
index 00000000..6887d201
--- /dev/null
+++ b/app/pdf/order_item_slim_pdf.rb
@@ -0,0 +1,129 @@
+class OrderItemSlimPdf < Prawn::Document
+  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(print_settings,order_item_slim, print_status, options, alt_name)
+    self.page_width = print_settings.page_width
+    self.page_height = print_settings.page_height
+    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 => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+    # super(:margin => [10, 5, 30, 5], :page_size => [200,400])
+
+    # db font setup
+    if print_settings.font != ""
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        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"
+     # font "public/fonts/padauk.ttf"  
+     #font "public/fonts/Chinese.ttf"     
+
+    text "#{ order_item_slim.type + '-' + order_item_slim.dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    stroke_horizontal_rule
+    move_down 1
+
+    #order_info
+    order_info(order_item_slim.order_id, order_item_slim.order_by,order_item_slim.order_at)
+
+    # order items slim
+    order_items_slim(order_item_slim, options, alt_name, print_settings.precision)
+  end
+
+  # Write Order Information to PDF
+  def order_info(order_no, order_by, order_at)  
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 1
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 1
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
+    end
+
+    stroke_horizontal_rule
+
+    move_down 3
+  end
+
+  # Write Order items to PDF
+  def order_items_slim(order_item_slim, options, alt_name, precision)
+    y_position = cursor
+
+    #Add Order Item    
+    add_order_items_slim(order_item_slim, options, alt_name, precision)
+
+    dash(1, :space => 1, :phase => 1)
+    stroke_horizontal_line 0, (self.page_width - self.margin)
+    move_down 1
+  end
+
+  # Add order items slim under order info
+  def add_order_items_slim(order_item_slim, options, alt_name, precision)
+    y_position = cursor
+
+    move_down 1
+
+    bounding_box([0,y_position], :width => self.item_width) do
+        text "#{order_item_slim.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(order_item_slim.qty.to_i, :precision => precision.to_i)}]", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([0,y_position], :width => self.item_width) do
+      text "#{order_item_slim.item_name}", :size => self.item_font_size,:align => :left
+
+    end
+
+    # if alt_name
+    #     if !(order_item_slim.alt_name).empty?
+    #         move_down 1
+    #         font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+    #             text "(#{order_item_slim.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+    #         end
+    #     end
+    # end
+
+    if !options.empty?
+        move_down 1
+
+        # add option
+        y_position = cursor
+        bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+            text "#{options}", :size => self.item_font_size,:align => :left
+        end
+    end
+    move_down 1
+
+  end
+
+end
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index ea0d4502..f48564a9 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -122,19 +122,21 @@ class OrderSummaryPdf < Prawn::Document
         end
         
         if alt_name
-          move_down 4
-          font("public/fonts/NotoSansCJKtc-Regular.ttf") do
-            text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+          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
 
-        move_down 5
-
         # add option
         options = odi.options == "[]"? "" : odi.options
         
         if options != ""
+          move_down 5
+          
           y_position = cursor
           bounding_box([0,y_position], :width => self.item_width) do
               text "#{options}", :size => self.item_font_size,:align => :left
diff --git a/app/pdf/order_summary_slim_pdf.rb b/app/pdf/order_summary_slim_pdf.rb
new file mode 100644
index 00000000..87aba403
--- /dev/null
+++ b/app/pdf/order_summary_slim_pdf.rb
@@ -0,0 +1,155 @@
+class OrderSummarySlimPdf < Prawn::Document
+  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(print_settings,order, print_status, order_items = nil,alt_name)
+    self.page_width = print_settings.page_width
+    self.page_height = print_settings.page_height
+    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 => [print_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    # db font setup
+    if print_settings.font != ""
+        font_families.update("#{print_settings.font}" => {
+            :normal => "public/fonts/#{print_settings.font}.ttf",
+            :italic => "public/fonts/#{print_settings.font}.ttf",
+            :bold => "public/fonts/#{print_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{print_settings.font}.ttf"
+        })
+
+        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"
+    # font "public/fonts/padauk.ttf"
+
+    text "#{ order[0].type + '-' + order[0].dining + print_status }", :size => self.header_font_size,:align => :center, :left_margin => -20
+    stroke_horizontal_rule
+    move_down 1
+
+    #order_info
+    order_info(order[0].order_id, order[0].order_by,order[0].order_at)
+
+    # order items
+    if order_items == nil
+      order_items(order, alt_name, print_settings.precision)
+    else
+      order_items(order_items, alt_name, print_settings.precision)
+    end
+  end
+
+  # Write Order Information to PDF
+  def order_info(order_no, order_by, order_at)    
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderNo: #{order_no} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 1
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "OrderBy: #{order_by} ", :size => self.item_font_size,:align => :left    
+    end
+
+    move_down 1
+    y_position = cursor
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Date: #{order_at.utc.getlocal.strftime("%Y-%m-%d %I:%M %p")}", :size => self.item_font_size,:align => :left    
+    end
+
+    stroke_horizontal_rule
+
+    move_down 1
+  end
+
+  # Write Order items to PDF
+  def order_items(order_item, alt_name, precision)
+    y_position = cursor
+
+    bounding_box([0,y_position], :width => self.item_width, :height => self.item_height) do
+        text "Item", :size => self.item_font_size,:align => :left
+    end
+
+    bounding_box([self.item_width,y_position], :width => self.qty_width, :height => self.item_height) do
+        text "Qty", :size => self.item_font_size,:align => :left
+    end
+
+    stroke_horizontal_rule
+    move_down 1
+
+    #Add Order Item
+    add_order_items(order_item, alt_name, precision)
+    
+  end
+
+  # Add order items under order info
+  def add_order_items(order_item, alt_name, precision)
+    y_position = cursor
+
+    move_down 1
+
+    order_item.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) do
+          text "#{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_name}", :size => self.item_font_size,:align => :left
+
+        end
+        
+        if alt_name
+          if !(odi.alt_name).empty?
+            move_down 1
+            font("public/fonts/NotoSansCJKtc-Regular.ttf") do
+              text "(#{odi.alt_name})", :size => self.item_font_size,:align => :left, :inline_format => true
+            end
+          end
+        end
+
+        # add option
+        options = odi.options == "[]"? "" : odi.options
+        
+        if options != ""
+          move_down 1
+
+          y_position = cursor
+          bounding_box([0,y_position], :width => self.item_width) do
+              text "#{options}", :size => self.item_font_size,:align => :left
+          end
+
+          move_down 1
+        end
+
+        move_down 1
+
+        dash(1, :space => 1, :phase => 1)
+        stroke_horizontal_line 0, (self.page_width - self.margin)
+        move_down 1
+      # end
+    end        
+  end
+end
diff --git a/app/views/oqs/home/index.html.erb b/app/views/oqs/home/index.html.erb
index 7f7f2d24..f5868fa5 100755
--- a/app/views/oqs/home/index.html.erb
+++ b/app/views/oqs/home/index.html.erb
@@ -84,8 +84,8 @@
                     <%= qid.qty %>
                   </span> ]   
                 </p>                  
-
-                <p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
+                
+                <br/><p class="card-text item-options"><%= qid.options == "[]"? "" : qid.options %></p> 
 
                 <span class="card-text">
                   <span class="text-muted">Order at - 
diff --git a/config/routes.rb b/config/routes.rb
index 4c302b94..a0db7858 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -244,7 +244,7 @@ scope "(:locale)", locale: /en|mm/ do
     post "/:id", to: "edit#update"
 
     # Pass assigned_order_item_id
-    get 'print/print/:id', to: "print#print"
+    post 'print/print/:id', to: "print#print"
     get 'print/print_order_summary/:id', to: "print#print_order_summary"
 
     get "/get_items/:id" => "home#get_items_by_oqs", :as => "get_order_items_by_oqs"

From 643cfaa1796e3d8cab13831e64ce5d59d60060ff Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 20 Dec 2017 16:20:43 +0630
Subject: [PATCH 16/84] change sale payment for paid_amount=0

---
 app/models/sale_payment.rb | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index c4b4cee4..14740851 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -179,7 +179,7 @@ class SalePayment < ApplicationRecord
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-    sale_update_payment_status(self.received_amount)
+    sale_update_payment_status(self.received_amount,true)
     return payment_status
   end
 
@@ -198,7 +198,7 @@ class SalePayment < ApplicationRecord
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-    sale_update_payment_status(self.received_amount,1)    
+    sale_update_payment_status(self.received_amount)    
 
     return payment_status
   end
@@ -290,7 +290,7 @@ class SalePayment < ApplicationRecord
 
   end
 
-  def sale_update_payment_status(paid_amount,check_foc = 0)    
+  def sale_update_payment_status(paid_amount,check_foc = false)    
     #update amount_outstanding
     self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
     self.sale.save!
@@ -350,7 +350,12 @@ class SalePayment < ApplicationRecord
       self.sale.save!
       table_update_status(sObj)
       
-      if paid_amount != "0.0" || check_foc > 0
+      puts "check_foc"
+      puts check_foc
+
+      if check_foc
+        update_shift
+      elsif paid_amount != "0.0"
         update_shift
       end
     end

From 589492ee492d005f05c37ef62d622930ae01dac3 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 20 Dec 2017 16:21:44 +0630
Subject: [PATCH 17/84] remove puts in sale payment

---
 app/models/sale_payment.rb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 14740851..5ab270b3 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -349,9 +349,6 @@ class SalePayment < ApplicationRecord
 
       self.sale.save!
       table_update_status(sObj)
-      
-      puts "check_foc"
-      puts check_foc
 
       if check_foc
         update_shift

From 802b51eab45b31a7f743b95265dce1f9f093f81a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 20 Dec 2017 17:11:27 +0630
Subject: [PATCH 18/84] update roundign adj and member discount in first bill

---
 app/controllers/origami/home_controller.rb    |  4 +
 .../origami/payments_controller.rb            | 43 +++++---
 app/pdf/receipt_bill_pdf.rb                   |  2 +-
 app/views/origami/home/show.html.erb          | 97 ++++++++++++++++---
 app/views/origami/payments/show.html.erb      |  8 +-
 5 files changed, 122 insertions(+), 32 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 47ec2383..d3c1db70 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -22,6 +22,10 @@ class Origami::HomeController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
+    @shop =  Shop::ShopDetail
+    @membership = MembershipSetting.find_by_discount(1)
+    @payment_methods = PaymentMethodSetting.all
+
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index eecb8dcf..b01ff09a 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -26,7 +26,21 @@ class Origami::PaymentsController < BaseOrigamiController
      #shop detail
     shop_details =  Shop::ShopDetail 
     # customer= Customer.where('customer_id=' +.customer_id)
-    customer= Customer.find(sale_data.customer_id)
+    customer = Customer.find(sale_data.customer_id)
+
+    # rounding adjustment
+      if shop_details.is_rounding_adj
+        a = sale_data.grand_total % 25
+        b = sale_data.grand_total / 25
+
+        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+          new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
+          rounding_adj = new_total-sale_data.grand_total
+          sale_data.update_attributes(grand_total: new_total,old_grand_total: sale_data.grand_total,rounding_adjustment:rounding_adj)        
+        end
+      end
+      #end rounding adjustment
+
     # get member information
     rebate = MembershipSetting.find_by_rebate(1)
     if customer.membership_id != nil && rebate
@@ -59,9 +73,13 @@ class Origami::PaymentsController < BaseOrigamiController
       
       # 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)        
+        a = saleObj.grand_total % 25
+        b = saleObj.grand_total / 25
+        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+          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
       #end rounding adjustment
 
@@ -278,14 +296,13 @@ class Origami::PaymentsController < BaseOrigamiController
       @shop        = Shop.find_by_id(1)
       
       if @shop.is_rounding_adj
-        new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
-      else
-        new_total    = saleObj.grand_total
+        a = saleObj.grand_total % 25
+        b = saleObj.grand_total / 25
+        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+          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
-      
-      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
+end
\ No newline at end of file
diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index ede3fb26..107e3163 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -20,7 +20,7 @@ class ReceiptBillPdf < Prawn::Document
     # @double = @qty_width * 1.3
     # @half_qty = @qty_width / 2
     #setting page margin and width
-    super(:margin => [20, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+    super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
     # db font setup
     if printer_settings.font != ""
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 2946791f..5dd6034c 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -1,4 +1,7 @@
 <div class="container-fluid">
+<div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
     <div class="row clearfix">
         <!-- Column One -->
         <div class="col-lg-6 col-md-6 col-sm-6">
@@ -264,7 +267,7 @@
                 <table class="table" id="order-charges-table" border="0">
                   <tr>
                     <td class="charges-name"><strong>Sub Total:</strong></td>
-                    <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+                    <td class="item-attr"><strong id="sub-total"><%= sub_total %></strong></td>
                   </tr>
                   <tr>
                     <% if @obj_sale != nil && @obj_sale.discount_type == 'member_discount' %>
@@ -291,7 +294,8 @@
                       <tr>
                         <td class="charges-name"><strong>Rounding Adj:</strong></td>
                         <td class="item-attr">
-                          <strong id="order-round-adj"><%= @obj_sale.rounding_adjustment rescue 0 %></strong></td>
+                          <strong id="order-round-adj"><%= @obj_sale.rounding_adjustment 
+                          %></strong></td>
                       </tr>
                       <tr>
                         <td class="charges-name"><strong>Grand Total:</strong></td>
@@ -387,8 +391,12 @@
 
                   <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" id="first_bill" class="btn btn-block bg-blue waves-effect">First Bill</button>
+
+                  <%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%>              
                   <button type="button" id="pay" class="btn btn-block bg-blue waves-effect">Pay</button>
                   <button type="button" id="void" class="btn btn-block bg-blue waves-effect" active="<%= can? :overall_void, :void %>"> Void</button>
               <% end %>
@@ -398,6 +406,34 @@
           <% else %>
             <button type="button" id="check_in" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.check_in") %></button>
           <% end %>
+           <span class="hidden" id="member_discount"><%= @membership.discount%></span>
+           <span class="hidden" id="membership_id"><%= @obj_sale.customer.membership_id rescue 0%></span>
+          <div class="modal fade" id="paymentModal" tabindex="-1" role="dialog">
+                <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
+                        </div>
+                        <div class="modal-body">
+                           <select class="form-control show-tick payment_method"  id="payment_method" >
+                             <option value="Cash">Cash</option>
+                            <% @payment_methods.each do |pay| %>
+                              <option value="<%= pay.payment_method %>">
+                                <%= pay.payment_method %>
+                              </option>
+                            <%end %>
+                            
+                            </select>   
+                        </div>
+                        <div class="modal-footer  p-r-30">
+                            <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                            &nbsp;  &nbsp;
+                           <button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
         </div>
     </div>
 </div>
@@ -516,20 +552,53 @@
             return false;
         });
     });
-
     // Print for first bill
     $("#first_bill").on('click', function () {
         var sale_id = $('#sale_id').val();
-        var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
-
-        $.ajax({
-            type: "GET",
-            url: ajax_url,
-            success: function (result) {
-                location.reload();
-            }
-        });
+          var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+          $.ajax({
+              type: "GET",
+              url: ajax_url,
+              success: function (result) {
+                  location.reload();
+              }
+          });  
     });
+    $(".choose_payment").on('click', function () {
+      $( "#loading_wrapper").show();
+
+        var sale_id = $('#sale_id').val();
+          type = $('.payment_method').val();
+
+          calculate_member_discount(sale_id,type);
+
+          var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+          $.ajax({
+              type: "GET",
+              url: ajax_url,
+              success: function (result) {
+                  $( "#loading_wrapper" ).hide();
+                  location.reload();
+              }
+          });  
+    });
+    function calculate_member_discount(sale_id,type) {
+       var sub_total = $('#sub-total').text();
+         if (type == "Cash") {
+           is_card = false
+         }else{
+          is_card = true
+         }
+        $.ajax({
+          type: "POST",
+          url: "/origami/" + sale_id + "/member_discount",
+          data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
+          async: false,
+          success:function(result){ 
+          }
+        });
+      
+    }
 
     // $('#pay').on('click', function () {
     //     var sale_id = $('#sale_id').val();
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 7359397a..43eb3248 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -94,11 +94,11 @@
             </tr>
             <tr>
               <td class="charges-name"><strong>Rounding Adj:</strong></td>
-              <td class="item-attr"><strong><span id="rounding_adj"><%=@rounding_adj rescue 0%></span></strong></td>
+              <td class="item-attr"><strong><%= @sale_data.rounding_adjustment rescue 0%></strong></td>
             </tr>
             <tr>
               <td class="charges-name"><strong>Grand Total</strong></td>
-              <td class="item-attr"><strong><span><%=@sale_data.grand_total+ @rounding_adj rescue 0%></span></strong></td>
+              <td class="item-attr"><strong><span><%=@sale_data.grand_total rescue 0%></span></strong></td>
             </tr>
             <%if @balance > 0%>
             <tr>
@@ -124,7 +124,7 @@
         <div class="col-md-4">
           <strong>
             <span id="grand_total" class="hidden"><%= @sale_data.grand_total rescue 0%></span>
-            <span id="amount_due"><%= @sale_data.grand_total + @rounding_adj rescue 0%></span></strong>
+            <span id="amount_due"><%= @sale_data.grand_total rescue 0%></span></strong>
         </div>
       </div>
      
@@ -223,7 +223,7 @@
         <!-- <br> -->
         <div class="row m-l-5 m-r-5">
           <div class="col-md-8"><strong>Balance</strong></div>
-          <div class="col-md-4"><strong><span id='balance'><%= @sale_data.grand_total+ @rounding_adj rescue 0 %></span></strong></div>
+          <div class="col-md-4"><strong><span id='balance'><%= @sale_data.grand_total rescue 0 %></span></strong></div>
         </div>
         <!-- <br> -->
       </div>

From e0d97470cc0489a6ad85b3a307f6bfa6d9350654 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 21 Dec 2017 10:35:09 +0630
Subject: [PATCH 19/84] update membership discount firstbill

---
 app/controllers/origami/home_controller.rb    |  3 +-
 .../origami/payments_controller.rb            |  4 +-
 app/controllers/origami/rooms_controller.rb   |  3 +
 app/models/membership_setting.rb              |  1 +
 app/views/origami/rooms/show.html.erb         | 75 ++++++++++++++++++-
 5 files changed, 80 insertions(+), 6 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index d3c1db70..50944b39 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -23,9 +23,8 @@ class Origami::HomeController < BaseOrigamiController
     @sale_array = Array.new
 
     @shop =  Shop::ShopDetail
-    @membership = MembershipSetting.find_by_discount(1)
+    @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
-
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index b01ff09a..d307cc5d 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -296,8 +296,8 @@ class Origami::PaymentsController < BaseOrigamiController
       @shop        = Shop.find_by_id(1)
       
       if @shop.is_rounding_adj
-        a = saleObj.grand_total % 25
-        b = saleObj.grand_total / 25
+        a = saleObj.grand_total % 25 # 
+        b = saleObj.grand_total / 25 #
         if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
           new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
           rounding_adj = new_total-saleObj.grand_total
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 6c0b98c8..4009666a 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -19,6 +19,9 @@ class Origami::RoomsController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
+    @shop =  Shop::ShopDetail
+    @membership = MembershipSetting::MembershipSetting
+    @payment_methods = PaymentMethodSetting.all
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
            @order_items = Array.new
diff --git a/app/models/membership_setting.rb b/app/models/membership_setting.rb
index 89f9eb14..3b60c781 100755
--- a/app/models/membership_setting.rb
+++ b/app/models/membership_setting.rb
@@ -1,2 +1,3 @@
 class MembershipSetting < ApplicationRecord
+	MembershipSetting = MembershipSetting.find_by_id(1)
 end
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 759a171c..d4869a6a 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -1,4 +1,7 @@
 <div class="container-fluid">
+<div id="loading_wrapper" style="display:none;">
+    <div id="loading"></div>
+  </div>
 <div class="row">
  <!-- Column One -->
  <div class="col-lg-6 col-md-6 col-sm-6">
@@ -260,7 +263,7 @@
            <table class="table" id="order-charges-table" border="0">
              <tr>
                <td class="charges-name"><strong>Sub Total:</strong></td>
-               <td class="item-attr"><strong id="order-sub-total"><%= sub_total %></strong></td>
+               <td class="item-attr"><strong id="sub-total"><%= sub_total %></strong></td>
              </tr>
              <tr>
                <%if @obj_sale != nil && @obj_sale.discount_type == 'member_discount'%>
@@ -369,10 +372,43 @@
         <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> -->
-        <button type="button" id="first_bill" class="btn bg-blue btn-block">First Bill</button>
+        <%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%> 
         <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 %>
+
+
+           <span class="hidden" id="member_discount"><%= @membership.discount%></span>
+           <span class="hidden" id="membership_id"><%= @obj_sale.customer.membership_id rescue 0%></span>
+          <div class="modal fade" id="paymentModal" tabindex="-1" role="dialog">
+                <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <h4 class="modal-title" id="paymentModalLabel">Choose Payment</h4>
+                        </div>
+                        <div class="modal-body">
+                           <select class="form-control show-tick payment_method"  id="payment_method" >
+                             <option value="Cash">Cash</option>
+                            <% @payment_methods.each do |pay| %>
+                              <option value="<%= pay.payment_method %>">
+                                <%= pay.payment_method %>
+                              </option>
+                            <%end %>
+                            
+                            </select>   
+                        </div>
+                        <div class="modal-footer  p-r-30">
+                            <button type="button" class="btn btn-link btn-danger waves-effect" data-dismiss="modal">CLOSE</button>
+                            &nbsp;  &nbsp;
+                           <button type="button" class="btn btn-link bg-blue waves-effect choose_payment">SAVE</button>
+                        </div>
+                    </div>
+                </div>
+            </div>
      <!-- Cashier Buttons -->
 
    <!-- <button type="button" id="re-print" class="btn bg-blue btn-block" >Re.Print</button> -->
@@ -538,6 +574,41 @@ $("#first_bill").on('click', function(){
     });
 });
 
+$(".choose_payment").on('click', function () {
+  $( "#loading_wrapper").show();
+  var sale_id = $('#sale_id').val();
+  type = $('.payment_method').val();
+
+  calculate_member_discount(sale_id,type);
+
+  var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+  $.ajax({
+    type: "GET",
+    url: ajax_url,
+    success: function (result) {
+      $( "#loading_wrapper" ).hide();
+      location.reload();
+    }
+  });  
+});
+function calculate_member_discount(sale_id,type) {
+ var sub_total = $('#sub-total').text();
+ if (type == "Cash") {
+   is_card = false
+ }else{
+  is_card = true
+}
+$.ajax({
+  type: "POST",
+  url: "/origami/" + sale_id + "/member_discount",
+  data: {'sale_id':sale_id, 'sub_total':sub_total,'is_card':is_card },
+  async: false,
+  success:function(result){ 
+  }
+});
+
+}
+
 $('#pay').on('click',function() {
    var sale_id = $('#sale_id').val();
    var url = '/origami/sale/'+ sale_id + "/rounding_adj" ;

From 90e7327bfe1ec0cc1bba083f4c637a356f389f40 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 10:37:01 +0630
Subject: [PATCH 20/84] add global variable in origami js

---
 app/assets/javascripts/origami.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index f23d13c6..802d676e 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -15,6 +15,8 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
+var _FIRST_BILL_ = "";
+
 $(document).on('turbolinks:load', function() {
 	$('.datetimepicker').bootstrapMaterialDatePicker({
 	  format: 'DD-MM-YYYY - HH:mm',

From 12f5e42d44418b0b4419bb05fef8ce76df8e17c3 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 21 Dec 2017 10:49:25 +0630
Subject: [PATCH 21/84] update comment for rounding adj

---
 app/controllers/origami/home_controller.rb    |  1 +
 .../origami/payments_controller.rb            | 21 ++++++++++++-------
 app/controllers/origami/rooms_controller.rb   |  1 +
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/app/controllers/origami/home_controller.rb b/app/controllers/origami/home_controller.rb
index 50944b39..fdf00b29 100755
--- a/app/controllers/origami/home_controller.rb
+++ b/app/controllers/origami/home_controller.rb
@@ -25,6 +25,7 @@ class Origami::HomeController < BaseOrigamiController
     @shop =  Shop::ShopDetail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
+    
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index d307cc5d..2c0de0f7 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -30,9 +30,10 @@ class Origami::PaymentsController < BaseOrigamiController
 
     # rounding adjustment
       if shop_details.is_rounding_adj
-        a = sale_data.grand_total % 25
-        b = sale_data.grand_total / 25
-
+        a = sale_data.grand_total % 25 # Modulus
+        b = sale_data.grand_total / 25 # Division
+        #not calculate rounding if modulus is 0 and division is even
+        #calculate rounding if modulus is zero or not zero and division are not even
         if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
           new_total    = Sale.get_rounding_adjustment(sale_data.grand_total)
           rounding_adj = new_total-sale_data.grand_total
@@ -73,8 +74,10 @@ class Origami::PaymentsController < BaseOrigamiController
       
       # rounding adjustment
       if shop_details.is_rounding_adj
-        a = saleObj.grand_total % 25
-        b = saleObj.grand_total / 25
+        a = saleObj.grand_total % 25 # Modulus
+        b = saleObj.grand_total / 25 # Division
+        #not calculate rounding if modulus is 0 and division is even
+        #calculate rounding if modulus is zero or not zero and division are not even
         if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
           new_total    = Sale.get_rounding_adjustment(saleObj.grand_total)
           rounding_adj = new_total-saleObj.grand_total
@@ -296,9 +299,11 @@ class Origami::PaymentsController < BaseOrigamiController
       @shop        = Shop.find_by_id(1)
       
       if @shop.is_rounding_adj
-        a = saleObj.grand_total % 25 # 
-        b = saleObj.grand_total / 25 #
-        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0)
+        a = saleObj.grand_total % 25 # Modulus
+        b = saleObj.grand_total / 25 # Division 
+        #not calculate rounding if modulus is 0 and division is even
+        #calculate rounding if modulus is zero or not zero and division are not even
+        if (a != 0.0 && b%2 != 0.0) || (a==0.0 && b%2 !=0) 
           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)
diff --git a/app/controllers/origami/rooms_controller.rb b/app/controllers/origami/rooms_controller.rb
index 4009666a..5e5b42cb 100755
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -22,6 +22,7 @@ class Origami::RoomsController < BaseOrigamiController
     @shop =  Shop::ShopDetail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
+    
     @room.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
            @order_items = Array.new

From 11b8466e104780466ab65175e32c5f57d0a3d7b1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 15:11:11 +0630
Subject: [PATCH 22/84] check first bill or not

---
 app/assets/javascripts/origami.js        | 41 ++++++++++++++++++++++--
 app/views/origami/home/show.html.erb     | 41 +++++++++++++++++-------
 app/views/origami/payments/show.html.erb |  6 ++++
 app/views/origami/rooms/show.html.erb    | 17 ++++++++++
 4 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 802d676e..c11df647 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -15,8 +15,6 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-var _FIRST_BILL_ = "";
-
 $(document).on('turbolinks:load', function() {
 	$('.datetimepicker').bootstrapMaterialDatePicker({
 	  format: 'DD-MM-YYYY - HH:mm',
@@ -145,3 +143,42 @@ $(document).on('turbolinks:load', function() {
 		return false;
 	});
 });
+
+/* start check first bill or not funs: */
+function checkReceiptNoInFirstBillData(receipt_no) {
+	var status = false;
+	if((receipt_no!=undefined) && (receipt_no!="")){
+		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+		if((arr_data!=undefined) && (arr_data!=null)){
+			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+			if((arr_data.length) > (json_data.length)){
+				status = true;
+			}
+		}
+	}
+
+	return status;
+}
+
+function createReceiptNoInFirstBillData(receipt_no) {
+	var arr_data = [];
+	var json_data = [];
+	var receipt_lists = localStorage.getItem("receipt_lists");
+	if((receipt_lists!=undefined) && (receipt_lists!=null) && (receipt_lists!="")){
+		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
+	}
+	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
+		arr_data.push({receipt_no});
+		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
+	}
+}
+
+function deleteReceiptNoInFirstBillData(receipt_no) {
+	var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+	if((arr_data!=undefined) && (arr_data!=null)){
+		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
+	}
+}
+/* end check first bill or not funs: */
\ No newline at end of file
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index b65deb7d..68c43ad8 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -156,8 +156,7 @@
                     <div class="col-lg-6 col-md-6 col-sm-6">
                       &nbsp; Receipt No: <span id="receipt_no">
                          <% if @status_sale == 'sale' %>
-                           <%= @sale_array[0].receipt_no rescue '' %>
-
+                          <%= @sale_array[0].receipt_no rescue '' %>
                          <% end %>
                        </span>
                        <br>
@@ -439,6 +438,18 @@
 </div>
 <script>
     $(document).ready(function () {
+      /* start check first bill or not*/
+        var receipt_no = "";
+        if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+          receipt_no = ($("#receipt_no").html()).trim();
+        }
+        // console.log(checkReceiptNoInFirstBillData(receipt_no));
+        if(checkReceiptNoInFirstBillData(receipt_no)){
+          $("#pay").show();
+        }else{
+          $("#pay").hide();
+        }
+      /* end check first bill or not*/
 
         $('.invoicedetails').on('click', function () {
             var dining_id = "<%= @dining.id %>";
@@ -555,14 +566,19 @@
     // Print for first bill
     $("#first_bill").on('click', function () {
         var sale_id = $('#sale_id').val();
-          var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
-          $.ajax({
-              type: "GET",
-              url: ajax_url,
-              success: function (result) {
-                  location.reload();
-              }
-          });  
+        var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
+
+        $.ajax({
+            type: "GET",
+            url: ajax_url,
+            success: function (result) {
+              receipt_no = ($("#receipt_no").html()).trim();
+              if((receipt_no!=undefined) && (receipt_no!=""))
+                createReceiptNoInFirstBillData(receipt_no);
+              
+              location.reload();
+            }
+        });  
     });
     $(".choose_payment").on('click', function () {
       $( "#loading_wrapper").show();
@@ -625,11 +641,12 @@
             url: ajax_url,
             // data: 'order_id='+ order_id,
             success: function (result) {
+
                 if (!result.status) {
                   swal("Information!", result.error_message);
                 }
-                else {
-                    location.reload();
+                else {              
+                  location.reload();
                 }
             }
         });
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 43eb3248..848a0b40 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -405,6 +405,12 @@
             data: "cash="+ cash + "&sale_id=" + sale_id,
             async: false,
             success:function(result){
+              /* start delete receipt no in first bill*/
+              if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+                var receipt_no = ($("#receipt_no").html()).trim();
+                deleteReceiptNoInFirstBillData(receipt_no);
+              }
+              /* end delete receipt no in first bill*/
 
               localStorage.removeItem("cash");             
               if (result.status) {
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index d4869a6a..db9e5f39 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -447,6 +447,19 @@ $(document).ready(function(){
   //   window.location.href = '/origami/order/' + order_id;
   // })
 
+  /* start check first bill or not*/
+    var receipt_no = "";
+    if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+      receipt_no = ($("#receipt_no").html()).trim();
+    }
+    // console.log(checkReceiptNoInFirstBillData(receipt_no));
+    if(checkReceiptNoInFirstBillData(receipt_no)){
+      $("#pay").show();
+    }else{
+      $("#pay").hide();
+    }
+  /* end check first bill or not*/
+
   $('.invoicedetails').on('click',function(){
     var dining_id = "<%= @room.id %>";
     var sale_id = this.id;
@@ -569,6 +582,10 @@ $("#first_bill").on('click', function(){
       type: "GET",
         url: ajax_url,
         success:function(result){
+          receipt_no = ($("#receipt_no").html()).trim();
+          if((receipt_no!=undefined) && (receipt_no!=""))
+            createReceiptNoInFirstBillData(receipt_no);
+          
           location.reload();
         }
     });

From fcc757122375c0d31ffecb45712fe08069e092b4 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 15:46:48 +0630
Subject: [PATCH 23/84] check current balance for rebate member & change
 firstbill fun:

---
 app/assets/javascripts/origami.js             | 78 +++++++++----------
 .../origami/payments_controller.rb            |  3 +-
 2 files changed, 41 insertions(+), 40 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index c11df647..e15794c2 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -15,6 +15,45 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
+/* start check first bill or not funs: */
+function checkReceiptNoInFirstBillData(receipt_no) {
+	var status = false;
+	if((receipt_no!=undefined) && (receipt_no!="")){
+		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+		if((arr_data!=undefined) && (arr_data!=null)){
+			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+			if((arr_data.length) > (json_data.length)){
+				status = true;
+			}
+		}
+	}
+
+	return status;
+}
+
+function createReceiptNoInFirstBillData(receipt_no) {
+	var arr_data = [];
+	var json_data = [];
+	var receipt_lists = localStorage.getItem("receipt_lists");
+	if((receipt_lists!=undefined) && (receipt_lists!=null) && (receipt_lists!="")){
+		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
+	}
+	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
+		arr_data.push({receipt_no});
+		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
+	}
+}
+
+function deleteReceiptNoInFirstBillData(receipt_no) {
+	var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+	if((arr_data!=undefined) && (arr_data!=null)){
+		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
+	}
+}
+/* end check first bill or not funs: */
+
 $(document).on('turbolinks:load', function() {
 	$('.datetimepicker').bootstrapMaterialDatePicker({
 	  format: 'DD-MM-YYYY - HH:mm',
@@ -143,42 +182,3 @@ $(document).on('turbolinks:load', function() {
 		return false;
 	});
 });
-
-/* start check first bill or not funs: */
-function checkReceiptNoInFirstBillData(receipt_no) {
-	var status = false;
-	if((receipt_no!=undefined) && (receipt_no!="")){
-		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-		if((arr_data!=undefined) && (arr_data!=null)){
-			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
-			if((arr_data.length) > (json_data.length)){
-				status = true;
-			}
-		}
-	}
-
-	return status;
-}
-
-function createReceiptNoInFirstBillData(receipt_no) {
-	var arr_data = [];
-	var json_data = [];
-	var receipt_lists = localStorage.getItem("receipt_lists");
-	if((receipt_lists!=undefined) && (receipt_lists!=null) && (receipt_lists!="")){
-		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
-	}
-	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
-		arr_data.push({receipt_no});
-		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
-	}
-}
-
-function deleteReceiptNoInFirstBillData(receipt_no) {
-	var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-	if((arr_data!=undefined) && (arr_data!=null)){
-		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
-		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
-	}
-}
-/* end check first bill or not funs: */
\ No newline at end of file
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index d307cc5d..d58af5ad 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -45,7 +45,8 @@ class Origami::PaymentsController < BaseOrigamiController
     rebate = MembershipSetting.find_by_rebate(1)
     if customer.membership_id != nil && rebate
       member_info = Customer.get_member_account(customer)
-      current_balance = SaleAudit.paymal_search(sale_id)
+      # current_balance = SaleAudit.paymal_search(sale_id)
+      current_balance = 0
     end
     # get printer info
     print_settings=PrintSetting.find_by_unique_code(unique_code)

From 4536caea6291cf9f93e7979148c1142bca7563e0 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 15:56:35 +0630
Subject: [PATCH 24/84] change fun:

---
 app/assets/javascripts/origami.js | 78 +++++++++++++++----------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index e15794c2..c11df647 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -15,45 +15,6 @@
 //= require BSBMaterial/demo.js
 //= require custom.js
 
-/* start check first bill or not funs: */
-function checkReceiptNoInFirstBillData(receipt_no) {
-	var status = false;
-	if((receipt_no!=undefined) && (receipt_no!="")){
-		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-		if((arr_data!=undefined) && (arr_data!=null)){
-			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
-			if((arr_data.length) > (json_data.length)){
-				status = true;
-			}
-		}
-	}
-
-	return status;
-}
-
-function createReceiptNoInFirstBillData(receipt_no) {
-	var arr_data = [];
-	var json_data = [];
-	var receipt_lists = localStorage.getItem("receipt_lists");
-	if((receipt_lists!=undefined) && (receipt_lists!=null) && (receipt_lists!="")){
-		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
-	}
-	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
-		arr_data.push({receipt_no});
-		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
-	}
-}
-
-function deleteReceiptNoInFirstBillData(receipt_no) {
-	var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-	if((arr_data!=undefined) && (arr_data!=null)){
-		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
-		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
-	}
-}
-/* end check first bill or not funs: */
-
 $(document).on('turbolinks:load', function() {
 	$('.datetimepicker').bootstrapMaterialDatePicker({
 	  format: 'DD-MM-YYYY - HH:mm',
@@ -182,3 +143,42 @@ $(document).on('turbolinks:load', function() {
 		return false;
 	});
 });
+
+/* start check first bill or not funs: */
+function checkReceiptNoInFirstBillData(receipt_no) {
+	var status = false;
+	if((receipt_no!=undefined) && (receipt_no!="")){
+		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+		if((arr_data!=undefined) && (arr_data!=null)){
+			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+			if((arr_data.length) > (json_data.length)){
+				status = true;
+			}
+		}
+	}
+
+	return status;
+}
+
+function createReceiptNoInFirstBillData(receipt_no) {
+	var arr_data = [];
+	var json_data = [];
+	var receipt_lists = localStorage.getItem("receipt_lists");
+	if((receipt_lists!=undefined) && (receipt_lists!=null) && (receipt_lists!="")){
+		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
+	}
+	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
+		arr_data.push({receipt_no});
+		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
+	}
+}
+
+function deleteReceiptNoInFirstBillData(receipt_no) {
+	var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
+	if((arr_data!=undefined) && (arr_data!=null)){
+		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
+	}
+}
+/* end check first bill or not funs: */
\ No newline at end of file

From 2e3d81dedb0c9d09b1580b09dff11c50c5a05b66 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 16:03:15 +0630
Subject: [PATCH 25/84] change js fun: in origami

---
 app/assets/javascripts/origami.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index c11df647..c3f9e0e9 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -148,8 +148,8 @@ $(document).on('turbolinks:load', function() {
 function checkReceiptNoInFirstBillData(receipt_no) {
 	var status = false;
 	if((receipt_no!=undefined) && (receipt_no!="")){
-		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-		if((arr_data!=undefined) && (arr_data!=null)){
+		if((localStorage.getItem("receipt_lists")!=undefined) && (localStorage.getItem("receipt_lists")!=null)){
+			var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
 			if((arr_data.length) > (json_data.length)){
 				status = true;
@@ -175,8 +175,8 @@ function createReceiptNoInFirstBillData(receipt_no) {
 }
 
 function deleteReceiptNoInFirstBillData(receipt_no) {
-	var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-	if((arr_data!=undefined) && (arr_data!=null)){
+	if((localStorage.getItem("receipt_lists")!=undefined) && (localStorage.getItem("receipt_lists")!=null)){
+		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
 		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
 	}

From 32df2682ea151ad1d67b3bc8a2edfdbf7c2fa465 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 16:11:13 +0630
Subject: [PATCH 26/84] change origami js

---
 app/assets/javascripts/origami.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index c3f9e0e9..f0a42fca 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -148,7 +148,7 @@ $(document).on('turbolinks:load', function() {
 function checkReceiptNoInFirstBillData(receipt_no) {
 	var status = false;
 	if((receipt_no!=undefined) && (receipt_no!="")){
-		if((localStorage.getItem("receipt_lists")!=undefined) && (localStorage.getItem("receipt_lists")!=null)){
+		if(localStorage.hasOwnProperty("receipt_lists")===true){
 			var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
 			if((arr_data.length) > (json_data.length)){
@@ -163,8 +163,7 @@ function checkReceiptNoInFirstBillData(receipt_no) {
 function createReceiptNoInFirstBillData(receipt_no) {
 	var arr_data = [];
 	var json_data = [];
-	var receipt_lists = localStorage.getItem("receipt_lists");
-	if((receipt_lists!=undefined) && (receipt_lists!=null) && (receipt_lists!="")){
+	if(localStorage.hasOwnProperty("receipt_lists")===true){
 		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
 	}
@@ -175,7 +174,7 @@ function createReceiptNoInFirstBillData(receipt_no) {
 }
 
 function deleteReceiptNoInFirstBillData(receipt_no) {
-	if((localStorage.getItem("receipt_lists")!=undefined) && (localStorage.getItem("receipt_lists")!=null)){
+	if(localStorage.hasOwnProperty("receipt_lists")===true){
 		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
 		localStorage.setItem("receipt_lists",JSON.stringify(json_data));

From 1330be36a54cb9110c83005b3b0690f6a6a63010 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 16:27:30 +0630
Subject: [PATCH 27/84] change arr format in origami js

---
 app/assets/javascripts/origami.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index f0a42fca..4046d3d9 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -148,6 +148,7 @@ $(document).on('turbolinks:load', function() {
 function checkReceiptNoInFirstBillData(receipt_no) {
 	var status = false;
 	if((receipt_no!=undefined) && (receipt_no!="")){
+		console.log(localStorage.length);
 		if(localStorage.hasOwnProperty("receipt_lists")===true){
 			var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
@@ -168,7 +169,7 @@ function createReceiptNoInFirstBillData(receipt_no) {
 		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
 	}
 	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
-		arr_data.push({receipt_no});
+		arr_data.push({'receipt_no':receipt_no});
 		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
 	}
 }

From 483d45b8e6775740dcbc9f16d5f09ed9e37015eb Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 16:46:59 +0630
Subject: [PATCH 28/84] add receipt no for member

---
 app/assets/javascripts/origami.js     | 1 -
 app/models/sale_payment.rb            | 2 +-
 app/views/origami/home/show.html.erb  | 4 ++++
 app/views/origami/rooms/show.html.erb | 4 ++++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 4046d3d9..e649f4b4 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -148,7 +148,6 @@ $(document).on('turbolinks:load', function() {
 function checkReceiptNoInFirstBillData(receipt_no) {
 	var status = false;
 	if((receipt_no!=undefined) && (receipt_no!="")){
-		console.log(localStorage.length);
 		if(localStorage.hasOwnProperty("receipt_lists")===true){
 			var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 5ab270b3..8fb1b48e 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -179,7 +179,7 @@ class SalePayment < ApplicationRecord
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-    sale_update_payment_status(self.received_amount,true)
+    sale_update_payment_status(self.received_amount)
     return payment_status
   end
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 68c43ad8..0fa545a3 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -594,6 +594,10 @@
               url: ajax_url,
               success: function (result) {
                   $( "#loading_wrapper" ).hide();
+                  receipt_no = ($("#receipt_no").html()).trim();
+                  if((receipt_no!=undefined) && (receipt_no!=""))
+                    createReceiptNoInFirstBillData(receipt_no);
+                  
                   location.reload();
               }
           });  
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index db9e5f39..229bb1c7 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -604,6 +604,10 @@ $(".choose_payment").on('click', function () {
     url: ajax_url,
     success: function (result) {
       $( "#loading_wrapper" ).hide();
+      receipt_no = ($("#receipt_no").html()).trim();
+      if((receipt_no!=undefined) && (receipt_no!=""))
+        createReceiptNoInFirstBillData(receipt_no);
+      
       location.reload();
     }
   });  

From 43b8fffc112a6a154e29c17a1b04da16c5e4524b Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 17:22:03 +0630
Subject: [PATCH 29/84] change rebate with creditnote in payment controller

---
 app/controllers/origami/payments_controller.rb | 4 +++-
 app/models/sale_payment.rb                     | 9 ++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index d58af5ad..6c9676e6 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -108,7 +108,9 @@ class Origami::PaymentsController < BaseOrigamiController
        
       # get member information
       rebate = MembershipSetting.find_by_rebate(1)
-      if customer.membership_id != nil && rebate
+      credit_data = SalePayment.find_by_sale_id_and_payment_method(sale_id,'creditnote')
+      
+      if customer.membership_id != nil && rebate && credit_data.nil?
         member_info    = Customer.get_member_account(customer)
         rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
         current_balance = SaleAudit.paymal_search(sale_id)
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 8fb1b48e..ad388cad 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -173,13 +173,20 @@ class SalePayment < ApplicationRecord
 
   private
   def cash_payment
+    status = false
+    sale_payments_data = SalePayment.find_by_sale_id(self.sale_id)
+    if sale_payments_data.nil?
+      status = true
+    end
+
     payment_status = false
     self.payment_method = "cash"
     self.payment_amount = self.received_amount
     self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
-    sale_update_payment_status(self.received_amount)
+
+    sale_update_payment_status(self.received_amount,status)
     return payment_status
   end
 

From f2fe6975d2e0dfc995a9be38328797bde345063d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 21 Dec 2017 18:04:23 +0630
Subject: [PATCH 30/84] update sale audit paymal

---
 app/models/customer.rb     | 2 +-
 app/models/sale_payment.rb | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/customer.rb b/app/models/customer.rb
index 85967e6a..8865448f 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -147,7 +147,7 @@ class Customer < ApplicationRecord
           response = self.rebat(Sale.find(sale.sale_id))
            #record an payment in sale-audit
             remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.received_amount} "
-            sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, "CronJob")   
+            sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, 1)   
 
            if response["status"] == true
              status   = sale.update_attributes(rebate_status: "true")
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 5ab270b3..be5ea41d 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -271,7 +271,7 @@ class SalePayment < ApplicationRecord
 
      #record an payment in sale-audit
       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, "Cashier")
+      sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
 
     if membership_data["status"]==true
       self.payment_method = "paypar"
@@ -328,7 +328,7 @@ class SalePayment < ApplicationRecord
         
          #record an payment in sale-audit
          remark = "#{response} Rebate- 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, "Cashier")
+         sale_audit = SaleAudit.record_paymal(self.sale.sale_id, remark, 1)
 
         if !response.nil?
           if response["status"] == true

From a3e15bf68cf0ed0df94619c6d4c4d38d5ee23877 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 18:04:27 +0630
Subject: [PATCH 31/84] check Add oth charges data

---
 .../origami/other_charges/index.html.erb      | 29 +++++++++++++++----
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/app/views/origami/other_charges/index.html.erb b/app/views/origami/other_charges/index.html.erb
index 0317d120..627e7342 100755
--- a/app/views/origami/other_charges/index.html.erb
+++ b/app/views/origami/other_charges/index.html.erb
@@ -96,7 +96,8 @@
   				<div class="form-horizontal">
   					<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">	
   					  <div class="bottom-5">										
-  							<input type="text" id="other-charges-amount" name="other-charges-amount" class="form-control" placeholder="Amount" />							
+  							<input type="text" id="other-charges-amount" name="other-charges-amount" class="form-control" placeholder="Amount" onkeypress="return isNumberKey(event);" />		
+                <br><span id="other-charges-amountErr" style="color:red;"></span>					
   						</div>						
   						<div class="bottom-5">
   							<textarea id="reasons" name="reasons" rows="2" class="form-control" placeholder="Reasons"></textarea>
@@ -278,12 +279,19 @@
       if ($("#is_taxable:checked").length > 0) {
         is_taxable = 1
       }      
+      $("#other-charges-amountErr").html("");
+      if(charge_amount != ""){
+        $("#other-charges-amount").val("");
+        $("#reasons").val("");
+        // Update sub total
+        $('#order-sub-total').text(parseFloat(sub_total) + parseFloat(charge_amount));    
 
-			// Update sub total
-			$('#order-sub-total').text(parseFloat(sub_total) + parseFloat(charge_amount));		
-
-			var item_row = item_row_template(sale_id, charge_amount, reasons, is_taxable);
-			$("#order-items-table tbody").append(item_row);								
+        var item_row = item_row_template(sale_id, charge_amount, reasons, is_taxable);
+        $("#order-items-table tbody").append(item_row);
+      }
+			else{
+        $("#other-charges-amountErr").html("can't be blank");
+      }						
 		});
 
 		// Calculate Other Charges for Payment
@@ -361,4 +369,13 @@
 		return  item_row; 					   		
 	}
 
+  function isNumberKey(evt) {
+      var charCode = (evt.which) ? evt.which : event.keyCode;
+      if (charCode != 46 && charCode > 31 && (charCode < 48 || charCode > 57)) {
+          return false;
+      } else {
+          return true;
+      }      
+  }
+
 </script>

From 3878f1644b108495eef0e32f5d958ec41706c09a Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 21 Dec 2017 18:13:24 +0630
Subject: [PATCH 32/84] change UI for menu cats:

---
 app/views/settings/menu_categories/index.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/settings/menu_categories/index.html.erb b/app/views/settings/menu_categories/index.html.erb
index 870c19bc..8d8c044c 100755
--- a/app/views/settings/menu_categories/index.html.erb
+++ b/app/views/settings/menu_categories/index.html.erb
@@ -30,7 +30,7 @@
         <th><%= t("views.right_panel.detail.name") %></th>
         <th><%= t("views.right_panel.detail.alt_name") %></th>
         <th><%= t("views.right_panel.detail.is_available") %></th>
-        <th><%= t("views.right_panel.detail.order_by") %></th>
+        <!-- <th><%= t("views.right_panel.detail.order_by") %></th> -->
         <th><%= t("views.right_panel.detail.parent") %></th>
         <th><%= t("views.right_panel.detail.actions") %></th>
       </tr>
@@ -43,7 +43,7 @@
         <td><%= link_to settings_menu_category.name, settings_menu_category_path(settings_menu_category) %></td>
         <td><%= settings_menu_category.alt_name rescue ''%></td>
         <td><%= settings_menu_category.is_available rescue false%></td>
-        <td><%= settings_menu_category.order_by rescue ''%></td>
+        <!-- <td><%= settings_menu_category.order_by rescue ''%></td> -->
         <td><%= settings_menu_category.parent.name rescue ''%></td>
         <td><%= link_to t("views.btn.edit"), edit_settings_menu_category_path(settings_menu_category),:class => 'btn btn-info btn-sm waves-effect' %> 
        </td></td>
@@ -51,8 +51,8 @@
        <% end %>
      </tbody>
    </table>
+   <%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %> 
  </div>
- <%= paginate @settings_menu_categories, param_name: :page, :outer_window => 3 %> 
 </div>
 <div class="col-xs-12 col-sm-12 col-md-3 col-lg-3">
   <div class="card">

From a10a41f3ed002df67d0f5cba2a224a2fecf03df7 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 21 Dec 2017 19:16:53 +0630
Subject: [PATCH 33/84] update romm show page

---
 app/views/origami/rooms/show.html.erb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index d4869a6a..41d7f612 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -186,7 +186,7 @@
          <div class="card-title row customer_detail p-l-5 p-r-5" >
            <div class="col-lg-6 col-md-6 col-sm-6">
              <% if @status_sale == 'sale' %>
-              <p class="hidden customer-id"><%= @obj_sale_sale.customer_id rescue '' %></p>
+              <p class="hidden customer-id"><%= @obj_sale.customer_id rescue '' %></p>
               &nbsp; Customer : <%= @obj_sale.customer.name rescue '-' %>
              <%else%>
                <p class="hidden customer-id"><%= @obj_order.customer_id rescue "-" %></p>
@@ -361,7 +361,8 @@
        <!-- <button type="button" id="first_bill" class="btn bg-blue btn-block" disabled>First Bill</button> -->
        <!-- <button type="button" id="pay" class="btn bg-blue btn-block" disabled>Pay</button> -->
        <!-- <button type="button" class="btn bg-blue btn-block" disabled=""> Void </button> -->
-    <% else %>
+    <% end %>
+    <% if @status_sale == 'sale' %>
         <!-- <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>

From 7d8fddbdeb793486b9bbc0db3ff6bb28ca0fc6ad Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 22 Dec 2017 14:43:59 +0630
Subject: [PATCH 34/84] check order by and code for menu cats:

---
 app/pdf/receipt_bill_pdf.rb                   | 21 +++++++++++++------
 .../api/restaurant/menu/_menu.json.jbuilder   |  2 ++
 app/views/print_settings/_form.html.erb       |  8 +++++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 107e3163..14f05a00 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -5,12 +5,12 @@ class ReceiptBillPdf < Prawn::Document
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 0
-    self.price_width = 40
-    self.qty_width = 20
-    self.total_width = 40
+    self.price_width = 50
+    self.qty_width = 35
+    self.total_width = 50
     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.item_description_width = (self.page_width-5) / 2
     self.label_width = 100
 
     self.description_width = 150
@@ -22,6 +22,11 @@ class ReceiptBillPdf < Prawn::Document
     #setting page margin and width
     super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
 
+    #precision checked
+    if printer_settings.precision.to_i > 2
+        printer_settings.precision = 2
+    end
+
     # db font setup
     if printer_settings.font != ""
         font_families.update("#{printer_settings.font}" => {
@@ -124,6 +129,8 @@ class ReceiptBillPdf < Prawn::Document
   end
 
     def line_items(sale_items,precision,delimiter)
+        item_label_total_front_width = (self.item_width+self.price_width) + 15
+        item_label_total_end_width = self.total_width + 14
         move_down 5
         y_position = cursor
         move_down 5
@@ -132,7 +139,7 @@ class ReceiptBillPdf < Prawn::Document
             text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix
             text_box "Price", :at =>[self.item_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
             text_box "Qty", :at =>[(self.item_width+self.price_width),y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
-            text_box "Total", :at =>[(self.item_width+self.price_width+4),y_position], :width => self.total_width+3, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+            text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
         }
         move_down -5
         stroke_horizontal_rule
@@ -141,6 +148,8 @@ class ReceiptBillPdf < Prawn::Document
 
     def add_line_item_row(sale_items,precision,delimiter)
         item_name_width = (self.item_width+self.price_width)
+        item_total_front_width = item_name_width + 15
+        item_total_end_width = self.total_width + 14
         y_position = cursor
         move_down 5
         sub_total = 0.0
@@ -163,7 +172,7 @@ class ReceiptBillPdf < Prawn::Document
                    # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size                
                    text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
                    text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_name_width,y_position], :width => self.qty_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
-                   text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[(item_name_width+4),y_position], :width =>self.total_width+3, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
+                   text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
                 }
                 move_down 5
             end
diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder
index 9441daf9..cf046939 100755
--- a/app/views/api/restaurant/menu/_menu.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu.json.jbuilder
@@ -7,6 +7,8 @@ json.valid_time_to menu.valid_time_to.strftime("%H:%M")
 if (menu.menu_categories)
   json.categories  menu.menu_categories do |category|
     json.id category.id
+    json.code category.code
+    json.order_by category.order_by
     json.name category.name
     json.alt_name category.alt_name
     json.parent_id category.menu_category_id
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index 51ee0eaa..201d1411 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -15,8 +15,8 @@
           <%= f.input :api_settings %>
           <%= f.input :page_width %>
           <%= f.input :page_height %>
-          <%= f.input :print_copies, input_html: { min: '1', step: '1', :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanOne(this.value);" } %>
-          <%= f.input :precision %>
+          <%= f.input :print_copies, input_html: { min: 1, step: '1', :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanOne(this.value);" } %>
+          <%= f.input :precision, input_html: { min: 0, max: 2, :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanThree(this.value);" } %>
           <%= f.input :delimiter %>
           <%= f.input :heading_space %>
         </div>
@@ -73,4 +73,8 @@
   function greaterThanOne(val){
     if(parseInt(val)==0) $("#print_setting_print_copies").val(1);
   }
+
+  function greaterThanThree(val){
+    if(parseInt(val)>2) $("#print_setting_precision").val(2);
+  }
 </script>
\ No newline at end of file

From dad83a1f83fc578c4d63c788088c47faceb39fbd Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 22 Dec 2017 16:33:10 +0630
Subject: [PATCH 35/84] change receipt bill format

---
 app/pdf/receipt_bill_pdf.rb             | 46 ++++++++++++++++++-------
 app/views/print_settings/_form.html.erb |  4 +--
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/app/pdf/receipt_bill_pdf.rb b/app/pdf/receipt_bill_pdf.rb
index 14f05a00..ae02b22d 100755
--- a/app/pdf/receipt_bill_pdf.rb
+++ b/app/pdf/receipt_bill_pdf.rb
@@ -5,10 +5,10 @@ class ReceiptBillPdf < Prawn::Document
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
     self.margin = 0
-    self.price_width = 50
-    self.qty_width = 35
-    self.total_width = 50
-    self.item_width = self.page_width - ((self.price_width + self.qty_width + self.total_width))
+    self.price_width = 60
+    self.qty_width = 25
+    self.total_width = 60
+    self.item_width = self.page_width - ((self.qty_width + self.price_width + self.total_width))
     self.item_height = 15
     self.item_description_width = (self.page_width-5) / 2
     self.label_width = 100
@@ -129,16 +129,26 @@ class ReceiptBillPdf < Prawn::Document
   end
 
     def line_items(sale_items,precision,delimiter)
-        item_label_total_front_width = (self.item_width+self.price_width) + 15
-        item_label_total_end_width = self.total_width + 14
+        if precision.to_i > 0
+            item_label_qty_front_width = (self.item_width+self.price_width) + 5
+            item_label_qty_end_width = self.qty_width + 4
+            item_label_total_front_width = (self.item_width+self.price_width) + 10
+            item_label_total_end_width = self.total_width + 9
+        else
+            self.item_width = self.item_width.to_i + 8
+            item_label_qty_front_width = (self.item_width+self.price_width) + 8
+            item_label_qty_end_width = self.qty_width + 7
+            item_label_total_front_width = (self.item_width+self.price_width) + 5
+            item_label_total_end_width = self.total_width + 4
+        end
         move_down 5
         y_position = cursor
         move_down 5
         pad_top(15) {
             # @item_width.to_i + @half_qty.to_i
             text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix
-            text_box "Price", :at =>[self.item_width,y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
-            text_box "Qty", :at =>[(self.item_width+self.price_width),y_position], :width => self.qty_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+            text_box "Price", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+            text_box "Qty", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
             text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
         }
         move_down -5
@@ -147,9 +157,19 @@ class ReceiptBillPdf < Prawn::Document
     end
 
     def add_line_item_row(sale_items,precision,delimiter)
-        item_name_width = (self.item_width+self.price_width)
-        item_total_front_width = item_name_width + 15
-        item_total_end_width = self.total_width + 14
+        if precision.to_i > 0
+            item_name_width = (self.item_width+self.price_width)
+            item_qty_front_width = (self.item_width+self.price_width) + 5
+            item_qty_end_width = self.qty_width + 4
+            item_total_front_width = item_name_width + 10
+            item_total_end_width = self.total_width + 9
+        else
+            item_name_width = (self.item_width+self.price_width)
+            item_qty_front_width = item_name_width + 8
+            item_qty_end_width = self.qty_width + 7
+            item_total_front_width = item_name_width + 5
+            item_total_end_width = self.total_width + 4
+        end
         y_position = cursor
         move_down 5
         sub_total = 0.0
@@ -171,7 +191,7 @@ class ReceiptBillPdf < Prawn::Document
                   end
                    # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size                
                    text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
-                   text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_name_width,y_position], :width => self.qty_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
+                   text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
                    text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
                 }
                 move_down 5
@@ -478,7 +498,7 @@ class ReceiptBillPdf < Prawn::Document
             text "#{printed_status}",:style => :bold, :size => header_font_size,:align => :left
         end    
         bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
-            text "Thank You! See you Again", :left_margin => -10, :size => self.item_font_size,:align => :left
+            text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :left
         end        
 
         move_down 5
diff --git a/app/views/print_settings/_form.html.erb b/app/views/print_settings/_form.html.erb
index 201d1411..38e55330 100755
--- a/app/views/print_settings/_form.html.erb
+++ b/app/views/print_settings/_form.html.erb
@@ -16,7 +16,7 @@
           <%= f.input :page_width %>
           <%= f.input :page_height %>
           <%= f.input :print_copies, input_html: { min: 1, step: '1', :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanOne(this.value);" } %>
-          <%= f.input :precision, input_html: { min: 0, max: 2, :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanThree(this.value);" } %>
+          <%= f.input :precision, input_html: { min: 0, max: 2, :onkeypress => "return isNumberKey(event);", :onkeyup => "greaterThanTwo(this.value);" } %>
           <%= f.input :delimiter %>
           <%= f.input :heading_space %>
         </div>
@@ -74,7 +74,7 @@
     if(parseInt(val)==0) $("#print_setting_print_copies").val(1);
   }
 
-  function greaterThanThree(val){
+  function greaterThanTwo(val){
     if(parseInt(val)>2) $("#print_setting_precision").val(2);
   }
 </script>
\ No newline at end of file

From da4af7bfc504f98c664401555ce0abfafe87a721 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 22 Dec 2017 16:33:12 +0630
Subject: [PATCH 36/84] license updated

---
 app/controllers/application_controller.rb     |  16 +-
 app/controllers/install_controller.rb         |  24 +-
 app/models/license.rb                         | 428 +++++++++---------
 app/models/my_aes_crypt.rb                    |   3 +-
 .../api/restaurant/menu/_menu.json.jbuilder   |   1 +
 config/license.yml                            |  30 +-
 config/routes.rb                              |   1 +
 config/secrets.yml                            |   7 +-
 8 files changed, 250 insertions(+), 260 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index d10fbbf5..3f789fc4 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -36,20 +36,23 @@ class ApplicationController < ActionController::Base
         # redirect_to root_url(:host => request.domain) + "store_error"
          render :json => [{ status: false, message: 'Invalid Access!'}]
       end
-    else
+    else      
       # check for license file
       if check_license
         current_license(ENV["SX_PROVISION_URL"])
+      else
+        redirect_to activate_path
       end      
     end
   end
 
   def current_license(url)  
     @license = License.new(url)
-    if (@license.detail_with_local_file() == 0)
-      puts "Expired or No License!"
-    elsif (@license.detail_with_local_file() == 2)
-      puts "Expiring! pls, license extend..."
+    flag = @license.detail_with_local_file()
+    if (flag == 0)
+      flash[:notice] = 'Expired or No License!'      
+    elsif (flag == 2)
+      flash[:notice] = 'Expiring! Please, License extend...'      
     else
       puts "RUN SAY BYAR"
     end
@@ -108,9 +111,8 @@ class ApplicationController < ActionController::Base
   def check_license
     if License.check_license_file
       return true
-    else
-      redirect_to activate_path
     end
+    return false
   end
 end
 
diff --git a/app/controllers/install_controller.rb b/app/controllers/install_controller.rb
index a386416a..fac74926 100755
--- a/app/controllers/install_controller.rb
+++ b/app/controllers/install_controller.rb
@@ -1,6 +1,6 @@
 class InstallController < BaseController
   skip_before_action :verify_authenticity_token
-  before_action :check_license
+  # before_action :check_license
 
 	def index
 	end
@@ -17,20 +17,20 @@ class InstallController < BaseController
     db_schema = params[:db_schema]
     db_user = params[:db_user]
     db_password = params[:db_password]
-    phrase = license_key
+    phrase = license_key    
    
     # Check Exists IV
-    if flag == "<%= ENV['AES_IV'] %>"
-      # Export for Key 
-      aes = MyAesCrypt.new 
-      aes_key, aes_iv = aes.export_key(phrase)
-    else      
-      aes_key = ENV["AES_KEY"]
-      aes_iv = ENV["AES_IV"]
-    end
+    # if flag == "<%= ENV['AES_IV'] %>"
+    #   # Export for Key 
+    #   aes = MyAesCrypt.new 
+    #   aes_key, aes_iv = aes.export_key(phrase)
+    # else      
+    #   aes_key = ENV["AES_KEY"]
+    #   aes_iv = ENV["AES_IV"]
+    # end
 
     @license = License.new(ENV["SX_PROVISION_URL"])
-    response = @license.license_activate(aes_key, aes_iv, license_key, db_host, db_schema, db_user, db_password)
+    response = @license.license_activate(restaurant, license_key, db_host, db_schema, db_user, db_password)
     if response[:status]
       redirect_to root_url, notice: response["message"]
     else
@@ -38,7 +38,7 @@ class InstallController < BaseController
     end
 	end
 
-  def check_license
+  def check_license  
     if License.check_license_file
       redirect_to root_url
     end
diff --git a/app/models/license.rb b/app/models/license.rb
index e9922084..36ce9b29 100755
--- a/app/models/license.rb
+++ b/app/models/license.rb
@@ -68,31 +68,9 @@ class License
   end
 
   # For Local System
-  def detail_with_local_file()
-    # flag = ENV["AES_KEY"]
-    # # Check Exists IV
-    # if flag == "<%= ENV['AES_IV'] %>"
-    #   # Export for Key  
-    #   aes = MyAesCrypt.new 
-    #   aes_key, aes_iv = aes.export_key(lookup)
-    # else      
-    #   aes_key = ENV["AES_KEY"]
-    #   aes_iv = ENV["AES_IV"]
-    # end
-
+  def detail_with_local_file()    
     renewal_date_str = read_license("renewable_date")
-
-    # ##Check from local redis - if available load local otherwise get from remote
-    # renewable_date = "renewable_date:#{renewal_date_str}"
-
-    # ##Get redis connection from connection pool
-    # redis = Redis.new
-    # cache_renewable_date = redis.get(renewable_date)
-    # if cache_renewable_date.nil?
-    #   redis = Redis.new
-    #   redis.set(renewable_date, Marshal.dump(@license))
-    # else
-    #   get_renewable_date = Marshal.load(cache_renewable_date)
+    
     if check_expiring(renewal_date_str)   
       # return for all ok 
       return 1
@@ -110,13 +88,34 @@ class License
   end    
 
   # License Activation
-  def license_activate (key, iv, license_key, db_host, db_schema, db_user, db_password)
-    @params = { query: { lookup_type: self.server_mode, iv_key: iv, license_key: license_key } }
+  def license_activate (shop, license_key, db_host, db_schema, db_user, db_password)
+    aes = MyAesCrypt.new 
+    aes_key, aes_iv = aes.export_key(license_key)     
+
+    @params = { query: { lookup_type: self.server_mode, iv_key: aes_iv, license_key: license_key } }
     response = self.class.get("/activate", @params)
     @activate = response.parsed_response
 
-    Rails.logger.debug "License Remote Response - " + response.parsed_response.to_s
     if (@activate["status"])
+      ##Check from local redis - if available load local otherwise get from remote
+      cache_key = "shop:#{@activate["shop_name"]}"    
+
+      cache_license = nil    
+
+      ##Get redis connection from connection pool
+      redis = Redis.new
+      cache_license = redis.get(cache_key)    
+
+      Rails.logger.info "Cache key - " + cache_key.to_s
+
+      if cache_license.nil?   
+        cache = {"shop" => @activate["shop_name"], "key" => aes_key, "iv" => @activate["iv_key"], "renewable_date" => @activate["renewable_date"] }           
+        redis = Redis.new
+        redis.set(cache_key, Marshal.dump(cache))
+      end 
+
+      Rails.logger.info "License - " + response.parsed_response.to_s
+
       response =  create_license_file(@activate)
       if(response[:status])
         sym_path = "/home/yan/symmetric/"
@@ -149,19 +148,21 @@ class License
   end
 
   # Check Expired before 30 days
-  def check_expiring(renewal_date_str)
-    renewal_date = DateTime.parse(renewal_date_str)
-    renewal_date >  Date.today.advance(:days => 30)
+  def check_expiring(renewal_date_str)        
+    if !renewal_date_str.empty?
+      renewal_date = DateTime.parse(renewal_date_str)      
+      renewal_date >  Date.today.advance(:days => 30)
+    end
   end
 
   # Check License expired date from PROVISION SERVER
-  def check_expired(renewal_date_str)
+  def check_expired(renewal_date_str)    
     expired_date_str = read_license("renewable_date")
-    expired_date = DateTime.parse(expired_date_str)
     renewal_date = DateTime.parse(renewal_date_str)
-    if(renewal_date != expired_date){
+   
+    if(renewal_date_str != expired_date_str)
       update_license("renewable_date", renewal_date_str)
-    }
+    end
 
     if (renewal_date < Date.today)
       return true
@@ -176,16 +177,18 @@ class License
   end
 
   # read line by key for license file
-  def read_license(key)    
-    decrypted_line = ""
+  def read_license(key_name)    
+    decrypted_line = "" 
+    key, iv = get_redis_key()
+
     if File.exist?("config/license.yml")  
       File.open("config/license.yml").each do |line|
-        if line.include? (key)
-          decrypted_line_array = line.split(": ")                   
-          decrypted_line = AESCrypt.decrypt_data(decode_str(decrypted_line_array[1]), decode_str(ENV['AES_KEY']), decode_str(ENV['AES_IV']), ENV['CIPHER_TYPE'])
+        if line.include? (key_name)          
+          decrypted_line_array = line.split(": ")                            
+          decrypted_line = AESCrypt.decrypt_data(decode_str(decrypted_line_array[1]), decode_str(key), decode_str(iv), ENV['CIPHER_TYPE'])
         end
       end
-    end
+    end    
     return decrypted_line
   end
 
@@ -205,18 +208,19 @@ class License
 
   # Update license file for line
   def update_license(content, new_content)
-    if !new_content.include? "=="
-      str = encode_str(new_content)
-      crypted_str = AESCrypt.encrypt_data(str, ENV['AES_KEY'], ENV['AES_IV'], ENV['CIPHER_TYPE'])
-    end
+    key, iv = get_redis_key()
 
+    if !new_content.include? "=="      
+      crypted_str = AESCrypt.encrypt_data(new_content, decode_str(key), decode_str(iv), ENV['CIPHER_TYPE'])
+    end
+    
     content_str = read_license_no_decrypt(content)
     if File.exist?("config/license.yml")  
       file_str = File.read("config/license.yml")
-      new_file_str = file_str.gsub(content, crypted_str)
+      new_file_str = file_str.gsub(content_str, encode_str(crypted_str))
 
       # To write changes to the file, use:
-      # File.open("config/license.yml", "w") {|file| file.puts new_file_str }
+      File.open("config/license.yml", "w") {|file| file.puts new_file_str }
       
       # File.open("config/license.yml").each do |line|
       #   new_file_str = line.gsub(content, crypted_str)
@@ -225,189 +229,187 @@ class License
     end
   end  
 
-   private
-    def encode_str(str)
-      return Base64.encode64(str)
+  private
+  def get_redis_key
+    iv = ""
+    key = ""
+    shop = read_license_no_decrypt("shop_name")
+    ##Check from local redis - if available load local otherwise get from remote
+    cache_key = "shop:#{shop.chomp}"     
+
+    cache_shop = nil    
+
+    ##Get redis connection from connection pool
+    redis = Redis.new
+    cache_shop = redis.get(cache_key)    
+
+    if !cache_shop.nil? 
+      @shop = Marshal.load(cache_shop) 
+      key = @shop["key"] 
+      iv = @shop["iv"] 
+    end
+    return key, iv
+  end
+
+  def encode_str(str)
+    return Base64.encode64(str)
+  end
+
+  def decode_str(str)
+    return Base64.decode64(str)
+  end
+
+  # License File Creation
+  def create_license_file(response_data)
+    if File.exist?("config/license.yml") 
+      delete_license_file
     end
 
-    def decode_str(str)
-      return Base64.decode64(str)
+    begin
+      # Licese File Creation
+      File.open("config/license.yml", "w") do |f|    
+        f.puts("iv_key: #{response_data['iv_key']}")
+        f.puts("shop_name: #{response_data['shop_name']}")
+        f.puts("email: #{response_data['email']}")
+        f.puts("telephone: #{response_data['telephone']}")
+        f.puts("fax: #{response_data['fax']}")
+        f.puts("address: #{response_data['address']}")
+        f.puts("dbhost: #{response_data['dbhost']}")
+        f.puts("dbschema: #{response_data['dbschema']}")
+        f.puts("dbusername: #{response_data['dbusername']}")
+        f.puts("dbpassword: #{response_data['dbpassword']}")
+        f.puts("api_token: #{response_data['api_token']}")
+        f.puts("app_token: #{response_data['app_token']}")  
+        f.puts("plan_sku: #{response_data['plan_sku']}")
+        f.puts("renewable_date: #{response_data['renewable_date']}")
+        f.puts("plan_name: #{response_data['plan_name']}")
+      end          
+    rescue IOError
+       response = { "status": false, "message": "Activation is success but something is wrong. \n Please contact code2lab call center!"}
     end
+    response = { "status": true, "message": "Success Activation. License also created."}
+  end
 
-    # License File Creation
-    def create_license_file(response_data)
-      if File.exist?("config/license.yml") 
-        delete_license_file
-      end
-
+  # Symmetric Configuration
+  def create_symmetric_config(sym_location, db_host, db_schema, db_user, db_password)
+    if File.directory? (sym_location)
       begin
-        # Licese File Creation
-        File.open("config/license.yml", "w") do |f|    
-          f.puts("iv_key: #{response_data['iv_key']}")
-          f.puts("shop_name: #{response_data['shop_name']}")
-          f.puts("email: #{response_data['email']}")
-          f.puts("telephone: #{response_data['telephone']}")
-          f.puts("fax: #{response_data['fax']}")
-          f.puts("address: #{response_data['address']}")
-          f.puts("dbhost: #{response_data['dbhost']}")
-          f.puts("dbschema: #{response_data['dbschema']}")
-          f.puts("dbusername: #{response_data['dbusername']}")
-          f.puts("dbpassword: #{response_data['dbpassword']}")
-          f.puts("api_token: #{response_data['api_token']}")
-          f.puts("app_token: #{response_data['app_token']}")  
-          f.puts("plan_sku: #{response_data['plan_sku']}")
-          f.puts("renewable_date: #{response_data['renewable_date']}")
-          f.puts("plan_name: #{response_data['plan_name']}")
-        end          
+        # sx properties create
+        f = File.open(sym_location + "engines/sx.properties", "w")
+        f.write("engine.name=sx\n")
+        f.write("db.driver=com.mysql.jdbc.Driver\n")
+        f.write("db.url=jdbc:mysql://#{db_host}/#{db_schema}?tinyInt1isBit=false\n")
+        f.write("db.user=#{db_user}\n")
+        f.write("db.password=#{db_password}\n")
+        f.write("registration.url=\n")
+        f.write("sync.url=http://#{db_host}:31415/sync/sx\n")
+        f.write("group.id=sx\n")
+        f.write("external.id=000\n")
+        f.write("job.purge.period.time.ms=7200000\n")
+        f.write("job.routing.period.time.ms=5000\n")  
+        f.write("job.push.period.time.ms=10000\n")  
+        f.write("job.pull.period.time.ms=10000\n")  
+        f.write("initial.load.create.first=true\n")  
+        f.write("initial.load.use.extract.job.enabled=true\n")         
+        f.close 
+
+        # read from license file 
+        shop_name = read_license_no_decrypt("shop_name")
+        dbhost = read_license("dbhost")
+        dbschema = read_license("dbschema")
+        dbusername = read_license("dbusername")
+        dbpassword = read_license("dbpassword")
+
+        # shop properties create
+        f = File.open(sym_location + "engines/#{shop_name}.properties", "w")
+        f.write("engine.name=#{shop_name}\n")
+        f.write("db.driver=com.mysql.jdbc.Driver\n")
+        f.write("db.url=jdbc:mysql://#{dbhost}/#{dbschema}?tinyInt1isBit=false\n")
+        f.write("db.user=#{dbusername}\n")
+        f.write("db.password=#{dbpassword}\n")
+        f.write("registration.url=http://#{db_host}:31415/sync/sx\n")
+        f.write("group.id=store\n")
+        f.write("external.id=001\n")
+        f.write("job.routing.period.time.ms=5000\n")  
+        f.write("job.push.period.time.ms=10000\n")  
+        f.write("job.pull.period.time.ms=10000\n")  
+        # f.write("initial.load.create.first=true\n")  
+        # f.write("initial.load.use.extract.job.enabled=true\n")         
+        f.close
       rescue IOError
          response = { "status": false, "message": "Activation is success but something is wrong. \n Please contact code2lab call center!"}
       end
       response = { "status": true, "message": "Success Activation. License also created."}
     end
+  end
 
-    # Symmetric Configuration
-    def create_symmetric_config(sym_location, db_host, db_schema, db_user, db_password)
-      if File.directory? (sym_location)
-        begin
-          # sx properties create
-          f = File.open(sym_location + "engines/sx.properties", "w")
-          f.write("engine.name=sx\n")
-          f.write("db.driver=com.mysql.jdbc.Driver\n")
-          f.write("db.url=jdbc:mysql://#{db_host}/#{db_schema}?tinyInt1isBit=false\n")
-          f.write("db.user=#{db_user}\n")
-          f.write("db.password=#{db_password}\n")
-          f.write("registration.url=\n")
-          f.write("sync.url=http://#{db_host}:31415/sync/sx\n")
-          f.write("group.id=sx\n")
-          f.write("external.id=000\n")
-          f.write("job.purge.period.time.ms=7200000\n")
-          f.write("job.routing.period.time.ms=5000\n")  
-          f.write("job.push.period.time.ms=10000\n")  
-          f.write("job.pull.period.time.ms=10000\n")  
-          f.write("initial.load.create.first=true\n")  
-          f.write("initial.load.use.extract.job.enabled=true\n")         
-          f.close 
+  # Run Symmetric 
+  def run_symmetric(sym_path)
+    # check_sym_proc_str = `#{sym_path + "bin/sym_service status"}`
+    # check_sym_proc_str = check_sym_proc_str.split("\n")
+    # sym_install_status = check_sym_proc_str[0].split(": ")
+    
+    check_sym_proc_str = `#{"service SymmetricDS status"}`
 
-          # read from license file 
-          shop_name = read_license("shop_name")
-          dbhost = read_license("dbhost")
-          dbschema = read_license("dbschema")
-          dbusername = read_license("dbusername")
-          dbpassword = read_license("dbpassword")
+    # Check Sym Installed
+    # if sym_install_status[1] == "false"
+    #   response = { "status": false, "message": "Activation is success but Symmetric service not Installed. \n Please contact code2lab call center!"}
+    # end
 
-          # shop properties create
-          f = File.open(sym_location + "engines/#{shop_name}.properties", "w")
-          f.write("engine.name=#{shop_name}\n")
-          f.write("db.driver=com.mysql.jdbc.Driver\n")
-          f.write("db.url=jdbc:mysql://#{dbhost}/#{dbschema}?tinyInt1isBit=false\n")
-          f.write("db.user=#{dbusername}\n")
-          f.write("db.password=#{dbpassword}\n")
-          f.write("registration.url=http://#{db_host}:31415/sync/sx\n")
-          f.write("group.id=store\n")
-          f.write("external.id=001\n")
-          f.write("job.routing.period.time.ms=5000\n")  
-          f.write("job.push.period.time.ms=10000\n")  
-          f.write("job.pull.period.time.ms=10000\n")  
-          # f.write("initial.load.create.first=true\n")  
-          # f.write("initial.load.use.extract.job.enabled=true\n")         
-          f.close
-        rescue IOError
-           response = { "status": false, "message": "Activation is success but something is wrong. \n Please contact code2lab call center!"}
-        end
-        response = { "status": true, "message": "Success Activation. License also created."}
-      end
-    end
-
-    # Run Symmetric 
-    def run_symmetric(sym_path)
-      # check_sym_proc_str = `#{sym_path + "bin/sym_service status"}`
-      # check_sym_proc_str = check_sym_proc_str.split("\n")
-      # sym_install_status = check_sym_proc_str[0].split(": ")
-      
-      check_sym_proc_str = `#{"service SymmetricDS status"}`
-
-      # Check Sym Installed
-      # if sym_install_status[1] == "false"
-      #   response = { "status": false, "message": "Activation is success but Symmetric service not Installed. \n Please contact code2lab call center!"}
-      # end
-
-      # Run Sym Service
-      sym_run_status = check_sym_running(check_sym_proc_str, sym_path)
-      if sym_run_status
-        # Create Sym Table
-        check_sym_table = system(sym_path + "bin/symadmin --engine sx create-sym-tables")
-        if check_sym_table
-          sym_sql = Rails.root + "db/sym_master.sql"
-          
-          if File.exist? (sym_sql)
-            # Import Sym Sql to db and start sym
-            run_sym_sql = system(sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
-            stop_sym = system("service SymmetricDS stop")
-            run_sym = system("service SymmetricDS start")
-            if run_sym
-              response = { "status": true, "message": "Activation is success and Configuration done..."}
-            end
-          else
-            response = { "status": false, "message": "Activation is success but Symmetric Sql not found. \n Please contact code2lab call center!"}
+    # Run Sym Service
+    sym_run_status = check_sym_running(check_sym_proc_str, sym_path)
+    if sym_run_status
+      # Create Sym Table
+      check_sym_table = system(sym_path + "bin/symadmin --engine sx create-sym-tables")
+      if check_sym_table
+        sym_sql = Rails.root + "db/sym_master.sql"
+        
+        if File.exist? (sym_sql)
+          # Import Sym Sql to db and start sym
+          run_sym_sql = system(sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
+          stop_sym = system("service SymmetricDS stop")
+          run_sym = system("service SymmetricDS start")
+          if run_sym
+            response = { "status": true, "message": "Activation is success and Configuration done..."}
           end
+        else
+          response = { "status": false, "message": "Activation is success but Symmetric Sql not found. \n Please contact code2lab call center!"}
         end
-      else      
-        response = { "status": false, "message": "Activation is success but Symmetric not running. \n Please contact code2lab call center!"}
       end
+    else      
+      response = { "status": false, "message": "Activation is success but Symmetric not running. \n Please contact code2lab call center!"}
     end
+  end
 
-    # Check Symmetric Running
-    def check_sym_running(status, sym_path)
-      # Run Sym Service
-      # if status.include? "Server is already running" 
-      #   return true
-      # elsif status.include? "false"
-      #   sym_start_str = `#{sym_path + "bin/sym_service start"}`
-      #   if sym_start_str.include? "Started"
-      #     return true
-      #   else
-      #     check_sym_running(sym_start_status[0])
-      #   end  
-      # else
-      #   return true      
-      # end
+  # Check Symmetric Running
+  def check_sym_running(status, sym_path)
+    # Run Sym Service
+    # if status.include? "Server is already running" 
+    #   return true
+    # elsif status.include? "false"
+    #   sym_start_str = `#{sym_path + "bin/sym_service start"}`
+    #   if sym_start_str.include? "Started"
+    #     return true
+    #   else
+    #     check_sym_running(sym_start_status[0])
+    #   end  
+    # else
+    #   return true      
+    # end
 
-      if status.include? "Active: active (running)"   #"Server is already running"
-        return true
-      end
-      return false
+    if status.include? "Active: active (running)" || "Active: active (exited)"   #"Server is already running"
+      return true
     end
+    return false
+  end
 
-    # Delete License File
-    def delete_license_file
-      File.delete("config/license.yml") if File.exist?("config/license.yml")   
-    end
+  # Delete License File
+  def delete_license_file
+    File.delete("config/license.yml") if File.exist?("config/license.yml")   
+  end
 
     # Assign db info for Cloud
-   def assign(aes_key, aes_iv)
-    # self.name = @license["name"]
-    # self.address_1 = @license["address_1"]
-    # self.address_2 = @license["address_2"]
-    # self.township = @license["township"]
-    # self.city = @license["city"]
-    # self.country = @license["country"]
-    # self.email = @license["email"]
-    # self.phone = @license["phone"]
-    # self.fax = @license["fax"]
-    # self.logo = @license["logo"]
-    # self.localhost_address = @license["localhost_address"]
-    # self.subdomain = @license["subdomain"]
-    # self.plan_activation_date = Date.parse(@license["plan_activation_date"])
-    # self.plan_next_renewal_date = Date.parse(@license["plan_next_renewal_date"])
-
-    ## self.plan_activation_date = Date.strptime(@license["plan_activation_date"], "%Y-%m-%d")
-    ## self.plan_next_renewal_date = Date.strptime(@license["plan_next_renewal_date"], "%Y-%m-%d")
-
-    # self.plan_max_products = @license["plan_max_products"].to_i
-    # self.plan_max_customers = @license["plan_max_customers"].to_i
-    # self.plan_active_connections = @license["plan_active_connections"].to_i
-    # salt = @license["secret_key"]
-
+  def assign(aes_key, aes_iv)    
     key = Base64.decode64(aes_key)
     iv = Base64.decode64(aes_iv)
     
@@ -422,18 +424,6 @@ class License
       self.dbusername = AESCrypt.decrypt_data(dbusername, key, iv, ENV['CIPHER_TYPE'])
       self.dbpassword = AESCrypt.decrypt_data(dbpassword, key, iv, ENV['CIPHER_TYPE'])      
     end
-
-    # self.exchange_unqiue_id = @license["exchange_unqiue_id"]
-
-    # self.localqueue_host= @license["localqueue_host"]
-    # self.localqueue_user= @license["localqueue_user"]
-    # self.localqueue_password= @license["localqueue_password"]
-
-    # self.remotequeue_host = @license["remotequeue_host"]
-    # self.remotequeue_user = @license["remotequeue_user"]
-    # self.remotequeue_password = @license["remotequeue_password"]
-
-    # self.api_token = @license["api_token"]
-    # self.app_token = @license["app_token"]
+    
   end
 end
diff --git a/app/models/my_aes_crypt.rb b/app/models/my_aes_crypt.rb
index 569a401d..680d0624 100644
--- a/app/models/my_aes_crypt.rb
+++ b/app/models/my_aes_crypt.rb
@@ -17,8 +17,7 @@ class MyAesCrypt
 		passphrase = passphrase + ENV['SX_KEY']
 		passphrase = passphrase.gsub(".","_")
 		digest = Digest::SHA256.new
-		key_digest = digest.update(passphrase)
-		# iv_digest = digest.update(iv_salt)		
+		key_digest = digest.update(passphrase)			
 		key = key_digest.digest
 		
 		# iv = iv_digest.digest
diff --git a/app/views/api/restaurant/menu/_menu.json.jbuilder b/app/views/api/restaurant/menu/_menu.json.jbuilder
index 9441daf9..268a6391 100755
--- a/app/views/api/restaurant/menu/_menu.json.jbuilder
+++ b/app/views/api/restaurant/menu/_menu.json.jbuilder
@@ -9,6 +9,7 @@ if (menu.menu_categories)
     json.id category.id
     json.name category.name
     json.alt_name category.alt_name
+    json.order_by category.order_by
     json.parent_id category.menu_category_id
     json.is_available category.is_available
 
diff --git a/config/license.yml b/config/license.yml
index b96a0256..cc470a1d 100644
--- a/config/license.yml
+++ b/config/license.yml
@@ -1,15 +1,15 @@
-iv_key: A30HZdW+iDZA0vM5PAqwgg==
-shop_name: 7DdPBxVo8m1xpa5T2kIcWQ==
-email: yanaung.nyein@code2lab.com
-telephone: 111111
-fax: 111111
-address: bitp
-dbhost: 9+83FZetcbLZi6COG5PbSw==
-dbschema: shztSYIsNmM9nlHkR/4exQ==
-dbusername: LapN+Geriht8yk866FxNiQ==
-dbpassword: QtboWZ4ATE05vvYw6J+Uqw==
-api_token: nGyMizHtoVEFYCjSVEFJuzkxuBJwSsH
-app_token: QUdPwSakcsnuVLdfkXgGHhPMiIOcSSfaVwQyA
-plan_sku: 9+83FZetcbLZi6COG5PbSw==
-renewable_date: shztSYIsNmM9nlHkR/4exQ==
-plan_name: LapN+Geriht8yk866FxNiQ==
+iv_key: TP8dIx4nBGzr+tYyKn5+Xw==
+shop_name: Osaka
+email: wathonaun9@gmail.com
+telephone: 09979204288
+fax: 09979204288
+address: Yangon
+dbhost: nk57NaR38B2eSYyron3Nbw==
+dbschema: 3orxFaTi0uQhatBqZGiitQ==
+dbusername: EtMle9Gr0/PE3NFHHfwo5A==
+dbpassword: 86h61/O38GGo64nekz6oeA==
+api_token: FVAGMnjVdaScfydXMbMvPPRWnkEwCSuxs
+app_token: IoXPdqzbnQWbHsnxLAjMjimnjEJNySOeIo
+plan_sku: PyQJ2sk5NZTudqQ2YIU16A==
+renewable_date: d/Fk1deU/iPbZFDOdyKsjA==
+plan_name: weWOqr1tZ61Av6YKth1lDw==
diff --git a/config/routes.rb b/config/routes.rb
index 4c302b94..a4bd24c6 100755
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -12,6 +12,7 @@ scope "(:locale)", locale: /en|mm/ do
   #--------- SmartSales Activation ------------#
   get 'activate' => 'install#index'
   post 'activate' => 'install#activate'
+  get 'run_sym' => 'sym_control#run'
 
   #--------- Login/Authentication ------------#
   get 'auth/:emp_id' => 'home#show', as: :emp_login
diff --git a/config/secrets.yml b/config/secrets.yml
index af242402..37b1f0b0 100755
--- a/config/secrets.yml
+++ b/config/secrets.yml
@@ -12,12 +12,10 @@
 
 development:
   secret_key_base: b61d85f8ed2a1a9e0eeece3443b3e8f838d002cc1d9f32115d8e93db920e2957adfedc57501d44741211538f3108b742cdeada87d5bfae796c53da1f90a3cd61  
-  sx_provision_url: 192.168.1.147:3002/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
+  sx_provision_url: 192.168.1.49:3002/api #connect.smartsales.asia/api  #provision.zsai.ws/api   
   server_mode: application
   cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
-  aes_key: <%= ENV['AES_KEY'] %>
-  aes_iv: <%= ENV['AES_IV'] %>
 
 test:
   secret_key_base: 5c92143fd4a844fdaf8b22aba0cda22ef1fc68f1b26dd3d40656866893718ae5e58625b4c3a5dc86b04c8be0a505ec0ebc0be3bf52249a3d1e0c1334ee591cf0
@@ -28,7 +26,6 @@ production:
   secret_key_base: c4bc81065013f9a3506d385bcbd49586c42e586488144b0de90c7da36867de9fa880f46b5c4f86f0ce9b7c783bb5a73bdb0e5605a47716567294390e726d3e22  
   sx_provision_url: provision.zsai.ws/api  #192.168.1.94:3002
   server_mode: cloud
+  cipher_type: AES-256-CBC
   sx_key: Wh@t1$C2L
-  aes_key: <%= ENV['AES_KEY'] %>
-  aes_iv: <%= ENV['AES_IV'] %>
 

From 11d991240137bf66e4214c310e1f5275b38ea86a Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 22 Dec 2017 16:35:04 +0630
Subject: [PATCH 37/84] license updated

---
 app/controllers/sym_control_controller.rb | 35 +++++++++++++++++++++++
 app/views/sym_control/run.html.erb        |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 app/controllers/sym_control_controller.rb
 create mode 100755 app/views/sym_control/run.html.erb

diff --git a/app/controllers/sym_control_controller.rb b/app/controllers/sym_control_controller.rb
new file mode 100644
index 00000000..816b8f2c
--- /dev/null
+++ b/app/controllers/sym_control_controller.rb
@@ -0,0 +1,35 @@
+class SymControlController < BaseController
+  skip_before_action :verify_authenticity_token
+
+  def run
+  	sym_path = "/home/yan/symmetric/"
+  	check_sym_proc_str = `#{"service SymmetricDS status"}`
+      # Check Sym Installed
+      # if sym_install_status[1] == "false"
+      #   response = { "status": false, "message": "Activation is success but Symmetric service not Installed. \n Please contact code2lab call center!"}
+      # end
+
+      if check_sym_proc_str.include? "Active: active (running)" || "Active: active (exited)"   #"Server is already running"
+        # Create Sym Table
+        check_sym_table = system(sym_path + "bin/symadmin --engine sx create-sym-tables")
+        if check_sym_table
+          sym_sql = Rails.root + "db/sym_master.sql"
+          
+          if File.exist? (sym_sql)
+            # Import Sym Sql to db and start sym
+            run_sym_sql = system(sym_path + "bin/dbimport --engine sx " + sym_sql.to_s)
+            stop_sym = system("service SymmetricDS stop")
+            run_sym = system("service SymmetricDS start")
+            if run_sym
+              render :text => "<h1>Success!</h1>"
+            end
+          else
+            render :text => "<h1>Sym Sql file not found!</h1>"
+          end
+        end
+      else      
+        render :text => "<h1>Sym not running!</h1>"
+      end
+  end
+
+end
\ No newline at end of file
diff --git a/app/views/sym_control/run.html.erb b/app/views/sym_control/run.html.erb
new file mode 100755
index 00000000..8b137891
--- /dev/null
+++ b/app/views/sym_control/run.html.erb
@@ -0,0 +1 @@
+

From 5bd1daa152f16afdaac9dd2a238714a7fa0bfaa1 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 22 Dec 2017 17:51:02 +0630
Subject: [PATCH 38/84] update payment and memberdiscoun

---
 app/assets/javascripts/origami.js        |  27 +++-
 app/views/origami/home/show.html.erb     |   2 +-
 app/views/origami/payments/show.html.erb | 151 ++++++++++++++---------
 app/views/origami/rooms/show.html.erb    |   3 +-
 4 files changed, 114 insertions(+), 69 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index e649f4b4..725e6353 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -145,30 +145,45 @@ $(document).on('turbolinks:load', function() {
 });
 
 /* start check first bill or not funs: */
-function checkReceiptNoInFirstBillData(receipt_no) {
+function checkReceiptNoInFirstBillData(receipt_no,payment=null) {
+	// localStorage.removeItem('receipt_lists');
 	var status = false;
 	if((receipt_no!=undefined) && (receipt_no!="")){
 		if(localStorage.hasOwnProperty("receipt_lists")===true){
 			var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-			var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+			console.log(arr_data)
+			if (payment) {
+				var json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
+			}else{
+				var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+			}
+
 			if((arr_data.length) > (json_data.length)){
 				status = true;
 			}
 		}
 	}
-
-	return status;
+	if (payment) {
+		return json_data[0]["payment"];
+	}else{
+		return status;
+	}
 }
 
-function createReceiptNoInFirstBillData(receipt_no) {
+function createReceiptNoInFirstBillData(receipt_no,payment=null) {
 	var arr_data = [];
 	var json_data = [];
 	if(localStorage.hasOwnProperty("receipt_lists")===true){
 		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
+		if (payment) {
+			jdata = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
+			jdata.push({'receipt_no':receipt_no,'payment':payment});
+		   localStorage.setItem("receipt_lists",JSON.stringify(jdata));
+		}
 	}
 	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
-		arr_data.push({'receipt_no':receipt_no});
+		arr_data.push({'receipt_no':receipt_no,'payment':payment});
 		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
 	}
 }
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 0fa545a3..5471b5e4 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -596,7 +596,7 @@
                   $( "#loading_wrapper" ).hide();
                   receipt_no = ($("#receipt_no").html()).trim();
                   if((receipt_no!=undefined) && (receipt_no!=""))
-                    createReceiptNoInFirstBillData(receipt_no);
+                    createReceiptNoInFirstBillData(receipt_no,type);
                   
                   location.reload();
               }
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 848a0b40..1cf61690 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -290,6 +290,21 @@
 
 <script>
   $(document).ready(function(){
+    /* start check first bill or not*/
+        var receipt_no = "";
+        if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+          receipt_no = ($("#receipt_no").html()).trim();
+        }
+
+      payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment")
+        if(payment_type=="Cash"){
+           $("#card_payment").hide();
+           $("#credit_payment").hide();
+        }else if(payment_type=="Credit"){
+           $("#card_payment").hide();
+        }
+    
+      /* end check first bill or not*/
     var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
 
     $("#back").on('click', function() {
@@ -380,74 +395,88 @@
     });
 
     $('#pay').click(function() {
-      // $('#pay').text("Processing, Please wait!")
-      $( "#loading_wrapper").show();
-
-      if($('#balance').text() > 0){
-        swal ( "Oops" ,  "Insufficient Amount!" ,  "error" );
-        $( "#loading_wrapper").hide();
+      sub_total = $('#sub-total').text();
+      if (payment_type == 'MPU' && $('.mpu').text() == 0 && sub_total != 0.0) {
+          swal("Opps","Please Pay with MPU Payment","warning")
+      }else if(payment_type == "Redeem" && $('#ppamount').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with Redeem Payment","warning")
+      }else if(payment_type == "VISA" && $('#visacount').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with Visa Payment","warning")
+        
+      }else if(payment_type == "JCB" && $('#jcbcount').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with jcb Payment","warning")
+      }
+      else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with Master Payment","warning")
       }else{
-        $(this).off("click");
-        var sale_id   = $('#sale_id').text();
-        // var item_row  = $('.is_card');
 
-        // if (item_row.length < 1) {
-          calculate_member_discount(sale_id);
-        // }
-       
-          //  payment
-          var cash = $('#cash').text();
-          var credit = $('#credit').text();
-          var card = $('#card').text();
-          
-          $.ajax({type: "POST",
-            url: "<%= origami_payment_cash_path %>",
-            data: "cash="+ cash + "&sale_id=" + sale_id,
-            async: false,
-            success:function(result){
-              /* start delete receipt no in first bill*/
-              if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
-                var receipt_no = ($("#receipt_no").html()).trim();
-                deleteReceiptNoInFirstBillData(receipt_no);
-              }
-              /* end delete receipt no in first bill*/
+        $( "#loading_wrapper").show();
+        if($('#balance').text() > 0){
+          swal ( "Oops" ,  "Insufficient Amount!" ,  "error" );
+          $( "#loading_wrapper").hide();
+        }else{
+          $(this).off("click");
+          var sale_id   = $('#sale_id').text();
+          // var item_row  = $('.is_card');
 
-              localStorage.removeItem("cash");             
-              if (result.status) {
-                var msg = result.message;
-              }
-              else{
-                var msg = '';
-              }
-              $( "#loading_wrapper" ).hide();
-              if($('#balance').text() < 0){
-                swal({
-                  title: "Information!",
-                  text: 'Changed amount  ' + $('#balance').text() * (-1),
-                  html: true,
-                  closeOnConfirm: false,
-                  closeOnCancel: false,
-                  allowOutsideClick: false
-                }, function () {
+          // if (item_row.length < 1) {
+            calculate_member_discount(sale_id);
+          // }
+         
+            //  payment
+            var cash = $('#cash').text();
+            var credit = $('#credit').text();
+            var card = $('#card').text();
+            
+            $.ajax({type: "POST",
+              url: "<%= origami_payment_cash_path %>",
+              data: "cash="+ cash + "&sale_id=" + sale_id,
+              async: false,
+              success:function(result){
+                /* start delete receipt no in first bill*/
+                if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+                  var receipt_no = ($("#receipt_no").html()).trim();
+                  deleteReceiptNoInFirstBillData(receipt_no);
+                }
+                /* end delete receipt no in first bill*/
+
+                localStorage.removeItem("cash");             
+                if (result.status) {
+                  var msg = result.message;
+                }
+                else{
+                  var msg = '';
+                }
+                $( "#loading_wrapper" ).hide();
+                if($('#balance').text() < 0){
+                  swal({
+                    title: "Information!",
+                    text: 'Changed amount  ' + $('#balance').text() * (-1),
+                    html: true,
+                    closeOnConfirm: false,
+                    closeOnCancel: false,
+                    allowOutsideClick: false
+                  }, function () {
+                    window.location.href = '/origami';
+                  });
+                }else{         
+                  $('#pay').text("Pay");
+                  swal({
+                   title: "Information!",
+                   text: 'Thank You !',
+                   html: true,
+                   closeOnConfirm: false, 
+                   closeOnCancel: false,
+                   allowOutsideClick: false
+                 }, function () {
                   window.location.href = '/origami';
                 });
-              }else{         
-                $('#pay').text("Pay");
-                swal({
-                 title: "Information!",
-                 text: 'Thank You !',
-                 html: true,
-                 closeOnConfirm: false, 
-                 closeOnCancel: false,
-                 allowOutsideClick: false
-               }, function () {
-                window.location.href = '/origami';
-              });
+                }
               }
-            }
-          });
+            });
+          }
         }
-      });
+    });
 
     $('#void').on('click',function () {
       if ($(this).attr('active') === "true") { 
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index fb512235..06f7cfe8 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -356,6 +356,7 @@
        <!-- <button type="button" class="btn bg-blue btn-block" disabled >Edit</button> -->
        <!-- <button type="button" id="discount" class="btn bg-blue btn-block" disabled >Discount</button> -->
         <!-- <button type="button" id="other-charges" class="btn bg-blue btn-block" disabled>Charges</button> -->
+        <button type="button" id="customer" class="btn bg-blue btn-block" >Customer</button>
        <button type="button" class="btn bg-blue btn-block" id='move'>Move</button>
        <button type="button" id="request_bills" class="btn bg-blue btn-block">Req.Bill</button>
        <!-- <button type="button" id="first_bill" class="btn bg-blue btn-block" disabled>First Bill</button> -->
@@ -607,7 +608,7 @@ $(".choose_payment").on('click', function () {
       $( "#loading_wrapper" ).hide();
       receipt_no = ($("#receipt_no").html()).trim();
       if((receipt_no!=undefined) && (receipt_no!=""))
-        createReceiptNoInFirstBillData(receipt_no);
+        createReceiptNoInFirstBillData(receipt_no,type);
       
       location.reload();
     }

From c9f44e5f217fb7d6c32891d223689b1711d4978b Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Fri, 22 Dec 2017 17:51:21 +0630
Subject: [PATCH 39/84] license disable

---
 app/controllers/application_controller.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 3f789fc4..7fafd6bd 100755
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -38,11 +38,11 @@ class ApplicationController < ActionController::Base
       end
     else      
       # check for license file
-      if check_license
-        current_license(ENV["SX_PROVISION_URL"])
-      else
-        redirect_to activate_path
-      end      
+      # if check_license
+      #   current_license(ENV["SX_PROVISION_URL"])
+      # else
+      #   redirect_to activate_path
+      # end      
     end
   end
 

From ad86fe279e138f2e17a61b81ee0f92a7e64fdfa1 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 22 Dec 2017 18:24:29 +0630
Subject: [PATCH 40/84] check and change update shift payment

---
 app/models/sale_payment.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index fdad964c..f9d16873 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -372,6 +372,11 @@ class SalePayment < ApplicationRecord
       shift.update(self.sale)
       self.sale.shift_sale_id = shift.id
       self.sale.save
+    else
+      shift = ShiftSale.current_shift
+      shift.update(self.sale)
+      self.sale.shift_sale_id = shift.id
+      self.sale.save
     end
   end
 

From 67291f6ce20e8afabc5c71a5d58e60ed5d580d01 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 26 Dec 2017 14:45:32 +0630
Subject: [PATCH 41/84] change js format in origami

---
 app/assets/javascripts/addorder.js | 2 +-
 app/assets/javascripts/origami.js  | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index aa84b398..d8608481 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -526,7 +526,7 @@ $(function() {
       }
     });
     if (active) {
-      $(this).revoveClass('selected-option');
+      $(this).removeClass('selected-option');
     }else{
       $(this).addClass('selected-option');
     }
diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 725e6353..507e9b2f 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -151,7 +151,6 @@ function checkReceiptNoInFirstBillData(receipt_no,payment=null) {
 	if((receipt_no!=undefined) && (receipt_no!="")){
 		if(localStorage.hasOwnProperty("receipt_lists")===true){
 			var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
-			console.log(arr_data)
 			if (payment) {
 				var json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
 			}else{
@@ -178,12 +177,12 @@ function createReceiptNoInFirstBillData(receipt_no,payment=null) {
 		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
 		if (payment) {
 			jdata = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
-			jdata.push({'receipt_no':receipt_no,'payment':payment});
+			jdata.push({receipt_no:receipt_no, payment:payment});
 		   localStorage.setItem("receipt_lists",JSON.stringify(jdata));
 		}
 	}
 	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
-		arr_data.push({'receipt_no':receipt_no,'payment':payment});
+		arr_data.push({receipt_no:receipt_no, payment:payment});
 		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
 	}
 }

From d969f3d3eba7597188479b908d663d3111b88b78 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Tue, 26 Dec 2017 15:10:18 +0630
Subject: [PATCH 42/84] change js format for localStorage

---
 app/assets/javascripts/origami.js        | 12 ++++++------
 app/views/origami/home/show.html.erb     |  8 ++++----
 app/views/origami/payments/show.html.erb | 14 +++++++-------
 app/views/origami/rooms/show.html.erb    |  4 ++--
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/app/assets/javascripts/origami.js b/app/assets/javascripts/origami.js
index 507e9b2f..33252efa 100755
--- a/app/assets/javascripts/origami.js
+++ b/app/assets/javascripts/origami.js
@@ -145,7 +145,7 @@ $(document).on('turbolinks:load', function() {
 });
 
 /* start check first bill or not funs: */
-function checkReceiptNoInFirstBillData(receipt_no,payment=null) {
+function checkReceiptNoInFirstBillData(receipt_no,payment) {
 	// localStorage.removeItem('receipt_lists');
 	var status = false;
 	if((receipt_no!=undefined) && (receipt_no!="")){
@@ -169,26 +169,26 @@ function checkReceiptNoInFirstBillData(receipt_no,payment=null) {
 	}
 }
 
-function createReceiptNoInFirstBillData(receipt_no,payment=null) {
+function createReceiptNoInFirstBillData(receipt_no,payment) {
 	var arr_data = [];
 	var json_data = [];
-	if(localStorage.hasOwnProperty("receipt_lists")===true){
+	if(localStorage.hasOwnProperty("receipt_lists") === true){
 		arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 		json_data = arr_data.filter(function(e) { return e.receipt_no == receipt_no });
 		if (payment) {
 			jdata = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
-			jdata.push({receipt_no:receipt_no, payment:payment});
+			jdata.push({'receipt_no':receipt_no,'payment':payment});
 		   localStorage.setItem("receipt_lists",JSON.stringify(jdata));
 		}
 	}
 	if(((arr_data.length == 0) && (json_data.length == 0)) || ((arr_data.length > 0) && (json_data.length == 0))){
-		arr_data.push({receipt_no:receipt_no, payment:payment});
+		arr_data.push({'receipt_no':receipt_no,'payment':payment});
 		localStorage.setItem("receipt_lists",JSON.stringify(arr_data));
 	}
 }
 
 function deleteReceiptNoInFirstBillData(receipt_no) {
-	if(localStorage.hasOwnProperty("receipt_lists")===true){
+	if(localStorage.hasOwnProperty("receipt_lists") ===true ){
 		var arr_data = JSON.parse(localStorage.getItem("receipt_lists"));
 		var json_data = arr_data.filter(function(e) { return e.receipt_no !== receipt_no });
 		localStorage.setItem("receipt_lists",JSON.stringify(json_data));
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 5471b5e4..b77e3b96 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -444,7 +444,7 @@
           receipt_no = ($("#receipt_no").html()).trim();
         }
         // console.log(checkReceiptNoInFirstBillData(receipt_no));
-        if(checkReceiptNoInFirstBillData(receipt_no)){
+        if(checkReceiptNoInFirstBillData(receipt_no,"")){
           $("#pay").show();
         }else{
           $("#pay").hide();
@@ -574,7 +574,7 @@
             success: function (result) {
               receipt_no = ($("#receipt_no").html()).trim();
               if((receipt_no!=undefined) && (receipt_no!=""))
-                createReceiptNoInFirstBillData(receipt_no);
+                createReceiptNoInFirstBillData(receipt_no,"");
               
               location.reload();
             }
@@ -657,7 +657,7 @@
     });
 
     $('#move').on('click', function () {
-        var dining_id = "<%= @dining.id %>"
+        var dining_id = "<%= @dining.id %>";
         window.location.href = '/origami/table/' + dining_id + "/movetable";
     })
 
@@ -783,7 +783,7 @@
 
       $.ajax({
         type: 'POST',
-        data: {dining_id : dining_id},
+        data: {'dining_id' : dining_id},
         datatype: 'JSON',
         url: '/origami/check_in',
         success: function(data) {
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 1cf61690..b9d2cf8b 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -397,23 +397,23 @@
     $('#pay').click(function() {
       sub_total = $('#sub-total').text();
       if (payment_type == 'MPU' && $('.mpu').text() == 0 && sub_total != 0.0) {
-          swal("Opps","Please Pay with MPU Payment","warning")
+          swal("Opps","Please Pay with MPU Payment","warning");
       }else if(payment_type == "Redeem" && $('#ppamount').text()==0 && sub_total != 0.0){
-          swal("Opps","Please Pay with Redeem Payment","warning")
+          swal("Opps","Please Pay with Redeem Payment","warning");
       }else if(payment_type == "VISA" && $('#visacount').text()==0 && sub_total != 0.0){
-          swal("Opps","Please Pay with Visa Payment","warning")
+          swal("Opps","Please Pay with Visa Payment","warning");
         
       }else if(payment_type == "JCB" && $('#jcbcount').text()==0 && sub_total != 0.0){
-          swal("Opps","Please Pay with jcb Payment","warning")
+          swal("Opps","Please Pay with jcb Payment","warning");
       }
       else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){
-          swal("Opps","Please Pay with Master Payment","warning")
+          swal("Opps","Please Pay with Master Payment","warning");
       }else{
 
         $( "#loading_wrapper").show();
         if($('#balance').text() > 0){
-          swal ( "Oops" ,  "Insufficient Amount!" ,  "error" );
-          $( "#loading_wrapper").hide();
+          swal ( "Oops", "Insufficient Amount!" ,  "error" );
+          $("#loading_wrapper").hide();
         }else{
           $(this).off("click");
           var sale_id   = $('#sale_id').text();
diff --git a/app/views/origami/rooms/show.html.erb b/app/views/origami/rooms/show.html.erb
index 06f7cfe8..3b7a5144 100755
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -455,7 +455,7 @@ $(document).ready(function(){
       receipt_no = ($("#receipt_no").html()).trim();
     }
     // console.log(checkReceiptNoInFirstBillData(receipt_no));
-    if(checkReceiptNoInFirstBillData(receipt_no)){
+    if(checkReceiptNoInFirstBillData(receipt_no,"")){
       $("#pay").show();
     }else{
       $("#pay").hide();
@@ -586,7 +586,7 @@ $("#first_bill").on('click', function(){
         success:function(result){
           receipt_no = ($("#receipt_no").html()).trim();
           if((receipt_no!=undefined) && (receipt_no!=""))
-            createReceiptNoInFirstBillData(receipt_no);
+            createReceiptNoInFirstBillData(receipt_no,"");
           
           location.reload();
         }

From a525babf9a5f7fbc113be6fde3f0fa4f052a3cd7 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 26 Dec 2017 16:19:25 +0630
Subject: [PATCH 43/84] update order queue printer for bitp k5 problem

---
 app/controllers/oqs/print_controller.rb   | 2 +-
 app/models/printer/order_queue_printer.rb | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/oqs/print_controller.rb b/app/controllers/oqs/print_controller.rb
index 0ff94403..f432ad29 100755
--- a/app/controllers/oqs/print_controller.rb
+++ b/app/controllers/oqs/print_controller.rb
@@ -4,7 +4,7 @@ class Oqs::PrintController < ApplicationController
   	unique_code="OrderItemPdf"
   	assigned_item_id = params[:id]
     options = params[:options]
-    assigned_item = AssignedOrderItem.find(assigned_item_id)  	
+    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
diff --git a/app/models/printer/order_queue_printer.rb b/app/models/printer/order_queue_printer.rb
index 499c718d..cc08f9ba 100755
--- a/app/models/printer/order_queue_printer.rb
+++ b/app/models/printer/order_queue_printer.rb
@@ -46,14 +46,16 @@ class Printer::OrderQueuePrinter < Printer::PrinterWorker
     order=print_query('order_summary', order_id)    
     # For Print Per Item
     if oqs.cut_per_item
-      order.each do|odi|
+
+      order_items.each do|odi|
+        odi_item=print_query('order_item', odi.order_items_id)   
         filename = "tmp/order_item_#{order_id}" + ".pdf" 
         # For Item Options
         options = odi.options == "[]"? "" : odi.options
 
         # check for item not to show 
         #if odi.price != 0
-          pdf = OrderItemPdf.new(print_settings,odi, print_status, options, oqs.use_alternate_name)
+          pdf = OrderItemPdf.new(print_settings,odi_item[0], print_status, options, oqs.use_alternate_name)
           # pdf.render_file "tmp/order_item.pdf"
           pdf.render_file filename
           if oqs.print_copy               

From 3d235f9d69d59570fc046747edcbecf4bc930c5c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 27 Dec 2017 10:30:22 +0630
Subject: [PATCH 44/84] add alert_time_min in api/checkin and  check for waiter
 login

---
 .../api/check_in_process_controller.rb        | 12 ++++++++-
 app/controllers/home_controller.rb            |  5 ++--
 app/views/layouts/_header.html.erb            | 24 ++++++++++--------
 app/views/layouts/login_dashboard.html.erb    | 25 +++++++++++++++++++
 app/views/origami/home/index.html.erb         |  3 ++-
 app/views/origami/home/show.html.erb          |  3 ++-
 6 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 4f1c4ae2..488684e7 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -11,7 +11,17 @@ class Api::CheckInProcessController < Api::ApiController
 				check_in_time = booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
 				check_out_time = booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
 
-				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time }
+				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
+				end
+
+				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min }
 			else 
 				render :json => { :status => false, :error_message => "No current booking!" }
 			end
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index d3666a60..1ee30bab 100755
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -3,7 +3,8 @@ class HomeController < ApplicationController
   skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]  
 
   def index
-    @employees = Employee.all_emp_except_waiter.order("name asc")
+    # @employees = Employee.all_emp_except_waiter.order("name asc")
+    @employees = Employee.all.order("name asc")
      @login_form = LoginForm.new()
     render "layouts/login_dashboard", layout: false
   end
@@ -45,7 +46,7 @@ class HomeController < ApplicationController
       elsif @employee.role == "manager"
         session[:session_token] = @employee.token_session
         redirect_to dashboard_path
-      elsif @employee.role == "supervisor"
+      elsif @employee.role == "supervisor" || @employee.role == "waiter"
         session[:session_token] = @employee.token_session
         redirect_to origami_root_path
       elsif @employee.role == "account"
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 41fe9480..a90636f3 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -14,7 +14,9 @@
     <div class="container-fluid">
         <div class="navbar-header">
             <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
-            <a href="javascript:void(0);" class="bars"></a>
+            <%if current_login_employee.role !="waiter" %>
+                <a href="javascript:void(0);" class="bars"></a>
+            <%end%>
             <a class="navbar-brand" href="<%=dashboard_path%>">
                 <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
                 <span class="navbar-brand-txt">SX Restaurant</span>
@@ -29,16 +31,16 @@
             </a>
             <ul class="dropdown-menu">
                 <li>
-                    <%if current_login_employee.role !="waiter" %>
-                        <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
-                            <i class="material-icons font-10 logout_icon">exit_to_app</i>
-                            <span class="font-18">Logout</span>
-                        </p>
-                         <span class="hidden" id="delete_text">
-                            <h6>Are you sure you want to Logout ?</h6>
-                            <!-- <h6>This action can't be undo. </h6> -->
-                        </span>
-                    <%end%>
+                    <!-- <%if current_login_employee.role !="waiter" %> -->
+                    <!-- <%end%> -->  
+                    <p class="delete waves-effect waves-block p-l-30 m-b-5" data-ref="<%=logout_path%>" data-method="delete">
+                        <i class="material-icons font-10 logout_icon">exit_to_app</i>
+                        <span class="font-18">Logout</span>
+                    </p>
+                     <span class="hidden" id="delete_text">
+                        <h6>Are you sure you want to Logout ?</h6>
+                        <!-- <h6>This action can't be undo. </h6> -->
+                    </span>
                 </li>   
             </ul>
             <!-- NO Need for color Change
diff --git a/app/views/layouts/login_dashboard.html.erb b/app/views/layouts/login_dashboard.html.erb
index 415856b9..f847ae54 100755
--- a/app/views/layouts/login_dashboard.html.erb
+++ b/app/views/layouts/login_dashboard.html.erb
@@ -145,6 +145,31 @@
 		           		<% end %>
            			<% end %>
                 </div>
+
+                <div class="row">
+                    <div class="col-1 col-black">
+                        <span>Waiter</span> 
+                    </div>
+                    <div class="col-11">
+                        <hr />
+                    </div>
+                </div>
+               
+                <div class="row m-b-15">
+                    <% @employees.each do |employee| %>
+                        <%if employee.role == "waiter" %>
+                            <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6 empBtn" data-formid="#form_<%= employee.emp_id %>" > 
+                                <form id="form_<%= employee.emp_id %>" action="<%= emp_login_path(employee.emp_id) %>" method="PATCH">
+                                </form>
+                                <div class="card emp-body">
+                                    <div class="body bg-teal">
+                                    <%=  employee.name%>
+                                </div>
+                                </div>
+                            </div>
+                        <% end %>
+                    <% end %>
+                </div>
             </div>
             <!-- <div class="col-xs-12 col-sm-12 col-md-2 col-lg-2"> </div> -->
         </div>
diff --git a/app/views/origami/home/index.html.erb b/app/views/origami/home/index.html.erb
index 939b969a..46132fff 100755
--- a/app/views/origami/home/index.html.erb
+++ b/app/views/origami/home/index.html.erb
@@ -118,12 +118,13 @@
       <button id="back" type="button" class="btn btn-block btn-lg bg-default"> <i class="material-icons">reply</i> <%= t("views.btn.back") %>
       </button>
    <%end%>
+   <%if current_login_employee.role != "waiter" %>
    <button id="cash_in" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_in") %> </button>
    <button id="cash_out" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.cash_out") %> </button>
    <!-- Temporary Disabled -->
 
    <button id="close_cashier" type="button" class="btn btn-block btn-lg bg-blue waves-effect"> <%= t("views.btn.close_cashier") %></button>
-
+   <%end%>
  </div>
  </div>
  </div>
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index b77e3b96..4343e230 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -369,6 +369,7 @@
              <%= t("views.btn.back") %>
           </button>
           <button type="button" id="add_order" class="btn btn-block bg-blue waves-effect"><%= t("views.btn.add") %> <%= t("views.right_panel.detail.order") %></button>
+          <% if current_login_employee.role != "waiter" %>
           <button type="button" id="survey" class="btn btn-block bg-blue waves-effect"><%= t("views.right_panel.detail.survey") %></button>
           <% if @dining.status != "available" %> 
               <% if @status_order == 'order' && @status_sale != 'sale' %>
@@ -432,7 +433,7 @@
                     </div>
                 </div>
             </div>
-
+          <% end %>
         </div>
     </div>
 </div>

From 0aba9e8d76aded0947de72b489c9fd07ed9853c8 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Wed, 27 Dec 2017 11:27:13 +0630
Subject: [PATCH 45/84] change css for logo

---
 app/views/layouts/_header.html.erb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index a90636f3..67746ba6 100755
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -16,11 +16,14 @@
             <!-- <a href="javascript:void(0);" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse" aria-expanded="false"></a> -->
             <%if current_login_employee.role !="waiter" %>
                 <a href="javascript:void(0);" class="bars"></a>
+                <a class="navbar-brand" href="<%=dashboard_path%>" style="margin-left: 20px;">
+            <% else %>
+                <a class="navbar-brand m-0" href="<%=dashboard_path%>">
             <%end%>
-            <a class="navbar-brand" href="<%=dashboard_path%>">
                 <img src="<%= asset_path('SX-Logo-small.png') %>" width="40" height="40" alt="Logo" />
                 <span class="navbar-brand-txt">SX Restaurant</span>
-            </a>           
+            </a>
+                       
         </div>
         <!-- Start Delete confirrm text !-->
         <div class="navbar-right">

From b2b05246d14bb26762e6f3f9aa589ccdfd6c418f Mon Sep 17 00:00:00 2001
From: Ye Min <yeminphyo@code2lab.com>
Date: Wed, 27 Dec 2017 13:11:05 +0630
Subject: [PATCH 46/84] Cap setup

---
 Gemfile                     | 14 +++++++++-----
 Gemfile.lock                | 38 ++++++++++++++++++++++++++++++++++---
 config/deploy.rb            | 20 +++++++++++++++++++
 config/deploy/production.rb |  9 +++++++++
 4 files changed, 73 insertions(+), 8 deletions(-)
 create mode 100644 config/deploy.rb
 create mode 100644 config/deploy/production.rb

diff --git a/Gemfile b/Gemfile
index 1432e3af..de22a68c 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-
+ruby '2.4.0'
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
@@ -89,10 +89,10 @@ gem 'cancancan', '~> 1.10'
 # Use Capistrano for deployment
 # gem 'capistrano-rails', group: :development
 
-group :development, :test do
+#group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
-  gem 'byebug', platform: :mri
-end
+#  gem 'byebug', platform: :mri
+#end
 
 group :development do
   # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
@@ -103,6 +103,10 @@ group :development do
   gem 'spring-watcher-listen', '~> 2.0.0'
   gem 'rspec-rails', '~> 3.5'
   gem 'schema_to_scaffold'
+  gem 'capistrano'
+  gem 'capistrano-bundler'
+  gem 'capistrano-rails'
+  gem 'capistrano-rbenv', github: "capistrano/rbenv"
 end
 
 group :test do
@@ -122,4 +126,4 @@ gem 'momentjs-rails' # for date-range selector
 # gem 'bootstrap-datepicker-rails' # date picker
 # gem 'jquery-datetimepicker-rails'
 # gem 'select2-rails' # for multi-select and auto-complete select box
-gem "chartkick" #chart lib
\ No newline at end of file
+gem "chartkick" #chart lib
diff --git a/Gemfile.lock b/Gemfile.lock
index d29f4058..b7804803 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,3 +1,11 @@
+GIT
+  remote: https://github.com/capistrano/rbenv.git
+  revision: c029e4128e4a8f25adda35795f5729bd4f62e51f
+  specs:
+    capistrano-rbenv (2.1.3)
+      capistrano (~> 3.1)
+      sshkit (~> 1.3)
+
 GEM
   remote: https://rubygems.org/
   specs:
@@ -39,12 +47,24 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     aescrypt (1.0.0)
+    airbrussh (1.3.0)
+      sshkit (>= 1.6.1, != 1.7.0)
     arel (8.0.0)
     bcrypt (3.1.11)
     bindex (0.5.0)
     builder (3.2.3)
-    byebug (9.1.0)
     cancancan (1.17.0)
+    capistrano (3.10.1)
+      airbrussh (>= 1.0.0)
+      i18n
+      rake (>= 10.0.0)
+      sshkit (>= 1.9.0)
+    capistrano-bundler (1.3.0)
+      capistrano (~> 3.1)
+      sshkit (~> 1.2)
+    capistrano-rails (1.3.1)
+      capistrano (~> 3.1)
+      capistrano-bundler (~> 1.1)
     carrierwave (1.2.1)
       activemodel (>= 4.0.0)
       activesupport (>= 4.0.0)
@@ -128,6 +148,9 @@ GEM
     multi_xml (0.6.0)
     mysql2 (0.4.9)
     nested_form (0.3.2)
+    net-scp (1.2.1)
+      net-ssh (>= 2.6.5)
+    net-ssh (4.2.0)
     nio4r (2.1.0)
     nokogiri (1.8.1)
       mini_portile2 (~> 2.3.0)
@@ -228,6 +251,9 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
+    sshkit (1.15.1)
+      net-scp (>= 1.1.2)
+      net-ssh (>= 2.8.0)
     tether-rails (1.4.0)
       rails (>= 3.1)
     thor (0.20.0)
@@ -260,8 +286,11 @@ PLATFORMS
 DEPENDENCIES
   aescrypt
   bcrypt (~> 3.1.7)
-  byebug
   cancancan (~> 1.10)
+  capistrano
+  capistrano-bundler
+  capistrano-rails
+  capistrano-rbenv!
   carrierwave (~> 1.0)
   chartkick
   coffee-rails (~> 4.2)
@@ -306,5 +335,8 @@ DEPENDENCIES
   web-console (>= 3.3.0)
   whenever
 
+RUBY VERSION
+   ruby 2.4.0p0
+
 BUNDLED WITH
-   1.16.0
+   1.16.1
diff --git a/config/deploy.rb b/config/deploy.rb
new file mode 100644
index 00000000..a2144cd1
--- /dev/null
+++ b/config/deploy.rb
@@ -0,0 +1,20 @@
+lock "3.10.1"
+
+set :application, "sxrestaurant"
+set :repo_url, 'git@bitbucket.org:code2lab/sxrestaurant.git'
+
+set :deploy_user, 'deploy'
+
+set :rbenv_type, :global
+set :rbenv_prefix, "RBENV_ROOT=#{fetch(:rbenv_path)} RBENV_VERSION=#{fetch(:rbenv_ruby)} #{fetch(:rbenv_path)}/bin/rbenv exec"
+
+set :rbenv_map_bins, %w{rake gem bundle ruby rails}
+
+set :keep_releases, 5
+
+set :linked_files, %w{config/database.yml config/secrets.yml config/puma.rb config/sidekiq.yml}
+
+set :linked_dirs, %w{bin log tmp/puma tmp/pids tmp/cache tmp/sockets vendor/bundle public/system pids sockets}
+
+set :tests, []
+set :pty, true
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
new file mode 100644
index 00000000..9a498da8
--- /dev/null
+++ b/config/deploy/production.rb
@@ -0,0 +1,9 @@
+set :stage, :production
+set :server_name, "svr.sxrestaurant.host"
+
+set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}"
+server '192.168.1.27', user: 'deploy', roles: %w{web app db}, primary: true
+
+set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}"
+set :rbenv_ruby, '2.4.0'
+set :rails_env, :production

From d8738dbf5ab4e4fe8c07d99bb6917f9181431e7d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 27 Dec 2017 18:16:31 +0630
Subject: [PATCH 47/84] update print add item code and addorder js for set item
 create in print

---
 app/assets/javascripts/addorder.js | 31 ++++++++++++++++++++++++++++++
 app/pdf/order_item_pdf.rb          |  4 ++--
 app/pdf/order_summary_pdf.rb       |  4 ++--
 3 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index d8608481..ff899c13 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -206,6 +206,7 @@ $(function() {
       $('.set_order').attr('data-min-qty',item_sets[field]["min_selectable_qty"]);
 
       value = item_sets[field]["instances"];
+
       $(value).each(function(i){
         $.ajax({
           type: "GET",
@@ -241,6 +242,11 @@ $(function() {
       });
     }
 
+     $('.set-item').attr('data-code',instances[0]['code']);
+     $('.set-item').attr('data-name',instances[0]['name']);
+     $('.set-item').attr('data-price',instances[0]['price']);
+     $('.set-item').attr('data-options','[]');
+
     $('#set_change_qty').val(1);
     $('#set_item_instances').text(instances);
     $('#set_name').text(data.attr('data-name'));
@@ -313,6 +319,8 @@ $(function() {
     item_name     = $('#set_name').text();
     min_qty       = $(this).data('min-qty');
 
+    default_instance = $('.set-item');
+
     var items  = $('.selected-instance');
 
     if (items.length >= min_qty) {
@@ -342,6 +350,29 @@ $(function() {
           $(".summary-items tbody").append(row);
         rowCount = rowCount + 1;
       });
+
+      var rowCount = $('.summary-items tbody tr').length+1;
+      option_arr = []
+        code          = $('.set-item').attr('data-code');
+        name          = $('.set-item').attr('data-name');
+        price         = $('.set-item').attr('data-price');
+        option        = $('.set-item').attr('data-options');
+        total         = qty * price ;
+        option_arr.push(option);
+        row ="<tr class='item_box' data-price ='"
+              +price+ "' data-toggle='modal' data-target='#sx_itemModal' 'data-instance ='"
+              +name+ "' data-code='"+item_code+"' data-instance-code='"
+              +code+"' data-attributes='"
+              +attribute_arr+"' data-options ='"
+              +option_arr+"' data-row ='"+rowCount+ "'>"
+          +'<td class="item-cell-no">'+rowCount+'</td>'
+          +'<td class="item-cell-name" id="item_name" >' + item_name+ ' ' + name +'</td>'
+          +'<td class="item-cell-qty" id="item_qty">' + qty + '</td>'
+          +'<td class="item-cell-price" id="item_price">' 
+          + parseFloat(total).toFixed(2)
+          +'</td>' 
+          +'</tr>';
+          $(".summary-items tbody").append(row);
       calculate_sub_total();
       $(".sx_item_set_detailModal").css({ 'display': "none" });
     }else{
diff --git a/app/pdf/order_item_pdf.rb b/app/pdf/order_item_pdf.rb
index e9887c62..9483b847 100755
--- a/app/pdf/order_item_pdf.rb
+++ b/app/pdf/order_item_pdf.rb
@@ -92,7 +92,7 @@ class OrderItemPdf < Prawn::Document
     move_down 5
 
     bounding_box([0,y_position], :width => self.item_width) do
-        text "#{order_item.item_name}", :size => self.item_font_size,:align => :left
+        text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left
     end
 
     bounding_box([self.item_width,y_position], :width => self.qty_width) do
@@ -100,7 +100,7 @@ class OrderItemPdf < Prawn::Document
     end
 
     bounding_box([0,y_position], :width => self.item_width) do
-      text "#{order_item.item_name}", :size => self.item_font_size,:align => :left
+      text "#{order_item.item_code} - #{order_item.item_name}", :size => self.item_font_size,:align => :left
 
     end
 
diff --git a/app/pdf/order_summary_pdf.rb b/app/pdf/order_summary_pdf.rb
index f48564a9..9e9873d2 100755
--- a/app/pdf/order_summary_pdf.rb
+++ b/app/pdf/order_summary_pdf.rb
@@ -108,7 +108,7 @@ class OrderSummaryPdf < Prawn::Document
         y_position = cursor
 
         bounding_box([0,y_position], :width => self.item_width) do
-          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+          text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
 
         end
 
@@ -117,7 +117,7 @@ class OrderSummaryPdf < Prawn::Document
         end
 
         bounding_box([0,y_position], :width => self.item_width) do
-          text "#{odi.item_name}", :size => self.item_font_size,:align => :left
+          text "#{odi.item_code} - #{odi.item_name}", :size => self.item_font_size,:align => :left
 
         end
         

From 722ee6982c8d92a0a751de74a254d34962dcff7c Mon Sep 17 00:00:00 2001
From: Ye Min <yeminphyo@code2lab.com>
Date: Thu, 28 Dec 2017 09:46:48 +0630
Subject: [PATCH 48/84] Ruby 2.4.1

---
 Capfile                     | 31 +++++++++++++++++++++++++++++++
 Gemfile                     |  2 +-
 config/deploy.rb            |  2 +-
 config/deploy/production.rb |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 Capfile

diff --git a/Capfile b/Capfile
new file mode 100644
index 00000000..9cfa1807
--- /dev/null
+++ b/Capfile
@@ -0,0 +1,31 @@
+# Load DSL and set up stages
+require "capistrano/setup"
+
+# Include default deployment tasks
+require "capistrano/deploy"
+
+# Include tasks from other gems included in your Gemfile
+#
+# For documentation on these, see for example:
+#
+#   https://github.com/capistrano/rvm
+#   https://github.com/capistrano/rbenv
+#   https://github.com/capistrano/chruby
+#   https://github.com/capistrano/bundler
+#   https://github.com/capistrano/rails
+#   https://github.com/capistrano/passenger
+#
+# require "capistrano/rvm"
+require "capistrano/rbenv"
+# require "capistrano/chruby"
+require "capistrano/bundler"
+require "capistrano/rails"
+require "capistrano/rails/assets"
+require "capistrano/rails/migrations"
+# require "capistrano/passenger"
+
+# Load custom tasks from `lib/capistrano/tasks` if you have any defined
+Dir.glob("lib/capistrano/tasks/*.rake").each { |r| import r }
+Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }
+Dir.glob('lib/capistrano/**/*.rb').each { |r| import r }
+
diff --git a/Gemfile b/Gemfile
index de22a68c..0fb5f323 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.4.0'
+ruby '2.4.1'
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"
diff --git a/config/deploy.rb b/config/deploy.rb
index a2144cd1..82cbb71e 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -1,6 +1,6 @@
 lock "3.10.1"
 
-set :application, "sxrestaurant"
+set :application, "zsai"
 set :repo_url, 'git@bitbucket.org:code2lab/sxrestaurant.git'
 
 set :deploy_user, 'deploy'
diff --git a/config/deploy/production.rb b/config/deploy/production.rb
index 9a498da8..7fed1a97 100644
--- a/config/deploy/production.rb
+++ b/config/deploy/production.rb
@@ -5,5 +5,5 @@ set :full_app_name, "#{fetch(:application)}_#{fetch(:stage)}"
 server '192.168.1.27', user: 'deploy', roles: %w{web app db}, primary: true
 
 set :deploy_to, "/home/#{fetch(:deploy_user)}/apps/#{fetch(:full_app_name)}"
-set :rbenv_ruby, '2.4.0'
+set :rbenv_ruby, '2.4.1'
 set :rails_env, :production

From 23e7c8db97a6afb122e6cd5ec35773b336663d5a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 28 Dec 2017 10:59:23 +0630
Subject: [PATCH 49/84] update payment control with first bill

---
 .../origami/others_payments_controller.rb        |  2 +-
 app/views/origami/home/show.html.erb             |  1 +
 app/views/origami/others_payments/index.html.erb | 16 +++++++++++++++-
 app/views/origami/payments/show.html.erb         |  8 +++++++-
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/controllers/origami/others_payments_controller.rb b/app/controllers/origami/others_payments_controller.rb
index fa88afb7..16c7edae 100755
--- a/app/controllers/origami/others_payments_controller.rb
+++ b/app/controllers/origami/others_payments_controller.rb
@@ -5,7 +5,7 @@ class Origami::OthersPaymentsController < BaseOrigamiController
   	@payment_method_setting = PaymentMethodSetting.all
 
   	@rebate = MembershipSetting.find_by_rebate(1)
-
+  	@sale_data = Sale.find_by_sale_id(@sale_id)
   	# @sale_id = params[:sale_id]
   	# sale_data = Sale.find_by_sale_id(@sale_id)
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index b77e3b96..6ca70e71 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -416,6 +416,7 @@
                         <div class="modal-body">
                            <select class="form-control show-tick payment_method"  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 %>
diff --git a/app/views/origami/others_payments/index.html.erb b/app/views/origami/others_payments/index.html.erb
index 2f847134..c0185182 100755
--- a/app/views/origami/others_payments/index.html.erb
+++ b/app/views/origami/others_payments/index.html.erb
@@ -14,8 +14,9 @@
 		<div class="col-lg-11col-md-11 col-sm-11">
 			<div >
 				<div >
+				<span id="receipt_no" class="hidden"><%=@sale_data.receipt_no rescue ' '%></span>
 					<% @payment_method_setting.where("is_active = true").each do |payment_method|%>
-					<div class="purple others-payment bottom left m-l-30" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
+					<div class="purple others-payment bottom left m-l-30 <%= payment_method.payment_method %>" data-type="<%= payment_method.payment_method %>" id="<%= payment_method.payment_method %>" data-url="<%=payment_method.gateway_url%>" data-sale-id="<%= @sale_id%>"><%= payment_method.payment_method %></div>
 					<% end %>
 				</div>
 			</div>
@@ -26,6 +27,19 @@
 	</div>
 </div>
 <script type="text/javascript">
+	/* start check first bill or not*/
+        var receipt_no = "";
+        if(($("#receipt_no").html()!=undefined) && ($("#receipt_no").html()!="")){
+          receipt_no = ($("#receipt_no").html()).trim();
+        }
+
+        payment_type =  checkReceiptNoInFirstBillData(receipt_no,"payment");
+	    if(payment_type) {
+	        $(".others-payment").hide();
+	        $("."+payment_type).show();
+	    }
+      
+     /* end check first bill or not*/
 
 	$('.others-payment').on('click',function(){
 		var input_type = $(this).attr("data-type");
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index b9d2cf8b..1010101d 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -302,9 +302,12 @@
            $("#credit_payment").hide();
         }else if(payment_type=="Credit"){
            $("#card_payment").hide();
+           $("#others_payment").hide();
+        }else if(payment_type=="MPU"||payment_type=="VISA"||payment_type=="JCB"||payment_type=="Master"){
+           $("#credit_payment").hide();
         }
-    
       /* end check first bill or not*/
+
     var dining_id = "<%= @sale_data.bookings[0].dining_facility_id %>";
 
     $("#back").on('click', function() {
@@ -408,6 +411,9 @@
       }
       else if(payment_type == "Master" && $('#mastercount').text()==0 && sub_total != 0.0){
           swal("Opps","Please Pay with Master Payment","warning");
+      }
+      else if(payment_type == "Credit" && $('#credit').text()==0 && sub_total != 0.0){
+          swal("Opps","Please Pay with Credit Payment","warning");
       }else{
 
         $( "#loading_wrapper").show();

From 06acf3acb99018aaa2b4eb69a7325e2c3b356642 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 28 Dec 2017 13:21:23 +0630
Subject: [PATCH 50/84] update ruby version

---
 Gemfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index de22a68c..0fb5f323 100755
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.4.0'
+ruby '2.4.1'
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
   "https://github.com/#{repo_name}.git"

From d58f7d1605793efd3df74d298d8fee5d17b23a5a Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 28 Dec 2017 16:21:49 +0630
Subject: [PATCH 51/84] update addord for extra time

---
 .../origami/addorders_controller.rb           | 67 ++++++++++++-------
 app/models/order.rb                           |  2 +-
 db/seeds.rb                                   | 21 ++++--
 3 files changed, 60 insertions(+), 30 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index d283b06e..ece423c7 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -62,9 +62,25 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
   def create
     Rails.logger.debug "Order Source - " + params[:order_source].to_s
     Rails.logger.debug "Table ID - " + params[:table_id].to_s
-    puts params[:order_items]
+    extra_time = false
+    time = ''
+
     items_arr = []
     JSON.parse(params[:order_items]).each { |i| 
+       if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
+         extra_time = true
+         if i["item_instance_code"] == 'Exti30'
+          t = Time.now
+           time = 30*i["quantity"]
+           puts time
+           puts "timmmmmmmmmmmmmmmmmmm"
+         else
+          t = Time.now
+           time = 1*i["quantity"]
+           puts time
+           puts "timmmmmmmmmmmmmmmmmmm"
+         end
+       end
        items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
        items_arr.push(items)
      }
@@ -78,35 +94,38 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
     @order.guest = params[:guest_info]
     @order.table_id = params[:table_id]  # this is dining facilities's id
     @order.new_booking = true
+    @order.extra_time = true
     @order.waiters = current_login_employee.name
     @order.employee_name = current_login_employee.name
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil?
-        # check booking id is already completed.
-        booking = Booking.find(params[:booking_id])
-        if booking
-          if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
-            if !booking.sale_id.nil?
-              sale_status = check_order_with_booking(booking)
-               # puts "WWwwWWWWWWww"
-               # puts sale_status
-              if sale_status
-                return return_json_status_with_code(400, "bill requested")
+          # check booking id is already completed.
+          booking = Booking.find(params[:booking_id])
+          puts "ssssssssssssssssssss"
+          if booking
+              if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
+                if !booking.sale_id.nil?
+                  sale_status = check_order_with_booking(booking)
+                    puts "WWwwWWWWWWww"
+                    puts sale_status
+                  if sale_status
+                    return return_json_status_with_code(400, "bill requested")
+                  end
+                else
+                  @order.new_booking = false
+                  @order.booking_id = params[:booking_id]
+                end
+              else
+                  sale_status = check_order_with_table(params[:table_id])
+                    puts "OOOOOOOOO"
+                    puts sale_status
+                  if sale_status
+                    return return_json_status_with_code(400, "bill requested")
+                  end
               end
-            else
-              @order.new_booking = false
-              @order.booking_id = params[:booking_id]
-            end
-          else
-              sale_status = check_order_with_table(params[:table_id])
-               # puts "OOOOOOOOO"
-               # puts sale_status
-              if sale_status
-                return return_json_status_with_code(400, "bill requested")
-              end
-          end
-        end #booking exists
+          end #booking exists
       else
+        puts "seeeeeeeeeeeeeeeeee"
         sale_status = check_order_with_table(params[:table_id])
          # puts "MMMMMMMM"
          # puts sale_status
diff --git a/app/models/order.rb b/app/models/order.rb
index ba8adc8f..676c129f 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -10,7 +10,7 @@ class Order < ApplicationRecord
   has_many :assigned_order_items
 
   #internal references attributes for business logic control
-  attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id
+  attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id, :extra_time
   scope :active, -> { where("date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
   #Main Controller method to create new order - validate all inputs and generate new order
   # order_item : {
diff --git a/db/seeds.rb b/db/seeds.rb
index 79aab88f..78321b72 100755
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -140,10 +140,11 @@ menu_options = MenuItemOption.create([{option_type: "Oil", name: "Less Oil", val
 menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle", value: "Bottle"},{option_type: "Package", name: "Can", value: "can"}])
 
 # #Default Menu Category
- # menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Person", alt_name: "Person", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
+# menu_category1 = MenuCategory.create({menu: menu, code:"C001", name: "Person", alt_name: "Person", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
 # menu_category2 = MenuCategory.create({menu: menu, code:"C005", name: "Beef & Mutton", alt_name: "Beef_and_mutton", order_by: 2,created_by: "SYSTEM DEFAULT"})
 # menu_category3 = MenuCategory.create({menu: menu, code:"C006", name: "Pork", alt_name: "Pork", order_by: 3,created_by: "SYSTEM DEFAULT"})
 # menu_category4 = MenuCategory.create({menu: menu, code:"C006", name: "Chicken", alt_name: "Chicken", order_by: 1, menu_category_id: menu_category3.id, created_by: "SYSTEM DEFAULT"})
+# menu_category5 = MenuCategory.create({menu: menu, code:"C001", name: "Extra Time", alt_name: "Extra Time", order_by: 1, is_available: 1, created_by: "SYSTEM DEFAULT"})
 #
 # #Default Menu items
 # menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"01001", name: "Single Pot", alt_name: "Single Pot",menu_category: menu_category1 , min_selectable_item: 1, max_selectable_item:1, account: food })
@@ -162,11 +163,21 @@ menu_pkg_options = MenuItemOption.create([{option_type: "Package", name: "Bottle
 # menu_item_attribute_adult = MenuItemAttribute.create({attribute_type:"person", name: "Adult", value: "adult"})
 # menu_item_attribute_child = MenuItemAttribute.create({attribute_type:"person", name: "Child", value: "child"})
 
- # menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"P00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" })
- # menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+# menu_category1_menu_item0 = SimpleMenuItem.create({item_code:"P00001", name: "Adult", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['1']", created_by: "System" })
+# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0001", menu_item: menu_category1_menu_item0, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+
+# menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"P00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" })
+# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
+
+# menu_item_attribute_30_min = MenuItemAttribute.create({attribute_type:"Extra Time", name: "30 min", value: "30_min"})
+# menu_item_attribute_60_min = MenuItemAttribute.create({attribute_type:"Extra Time", name: "1 hrs", value: "60_min"})
+
+# menu_category1_menu_item2 = SimpleMenuItem.create({item_code:"Ext30", name: "30 minutes", alt_name: "",menu_category: menu_category5 , min_qty: 1, account: extra_time, :item_attributes => "['1']", created_by: "System" })
+# menu_item0_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Exti30", menu_item: menu_category1_menu_item2, price:15000.00, is_on_promotion:false, is_default:true, :item_attributes => "['1']" })
+
+# menu_category1_menu_item3 = SimpleMenuItem.create({item_code:"Ext60", name: "1 hour", alt_name: "",menu_category: menu_category5 , min_qty: 1, account: extra_time, :item_attributes => "['2']", created_by: "System" })
+# menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"Exti60", menu_item: menu_category1_menu_item3, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
 
- # menu_category1_menu_item1 = SimpleMenuItem.create({item_code:"P00002", name: "Child", alt_name: "",menu_category: menu_category1 , min_qty: 1, account: person, :item_attributes => "['2']", created_by: "System" })
- # menu_item1_instance = MenuItemInstance.create({item_instance_name:"",item_instance_code:"PI0002", menu_item: menu_category1_menu_item1, price:10000.00, is_on_promotion:false, is_default:true, :item_attributes => "['2']" })
 # END
 
 menu_item_attribute_size_small = MenuItemAttribute.create({attribute_type:"size", name: "Small", value: "small"})

From 90525b9391977cf2fad51d770b0974855880013f Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 28 Dec 2017 17:48:56 +0630
Subject: [PATCH 52/84] add extra minutes in api/check_in

---
 app/controllers/api/check_in_process_controller.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/check_in_process_controller.rb b/app/controllers/api/check_in_process_controller.rb
index 488684e7..cf34700e 100644
--- a/app/controllers/api/check_in_process_controller.rb
+++ b/app/controllers/api/check_in_process_controller.rb
@@ -11,6 +11,8 @@ class Api::CheckInProcessController < Api::ApiController
 				check_in_time = booking.checkin_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
 				check_out_time = booking.checkout_at.utc.getlocal.strftime("%Y-%m-%d %H:%M")
 
+				extra_minutes = (booking.checkout_at - booking.reserved_at) / 1.minutes
+
 				lookup_checkout_time = Lookup.collection_of("checkout_alert_time")
 				alert_time_min = 0
 				if !lookup_checkout_time.nil?
@@ -21,7 +23,7 @@ class Api::CheckInProcessController < Api::ApiController
 					end
 				end
 
-				render :json => { :status => true, :check_in_time => check_in_time, :check_out_time => check_out_time, :alert_time_min => alert_time_min }
+				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 }
 			else 
 				render :json => { :status => false, :error_message => "No current booking!" }
 			end

From ecb9a5f010cfa8c8bfb7db13bbb5c50ed7089900 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 28 Dec 2017 18:02:25 +0630
Subject: [PATCH 53/84] update void foc and credit for member discount

---
 app/controllers/origami/payments_controller.rb |  5 +++++
 app/controllers/origami/void_controller.rb     |  8 ++++++--
 app/models/sale.rb                             |  1 +
 app/views/origami/home/show.html.erb           |  6 +++---
 app/views/origami/payments/show.html.erb       | 14 +++++++-------
 5 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 02e0c4ef..3ab55be8 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -261,6 +261,11 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj      = Sale.find(sale_id)
+         
+      if saleObj.discount_type == "member_discount"
+        saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
+      end
+      
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, @user, cash, "foc")
 
diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index 242a1c2e..ffb2bde4 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -6,7 +6,11 @@ class Origami::VoidController < BaseOrigamiController
 
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
-      
+      if sale.discount_type == "member_discount"
+        sale.update_attributes(total_discount: 0)
+        sale.compute_by_sale_items(sale_id, sale.sale_items,0)
+      end
+
       # update count for shift sale
       if(sale.sale_status == "completed")
         if sale.shift_sale_id != nil
@@ -21,7 +25,7 @@ class Origami::VoidController < BaseOrigamiController
           shift.save
         end
       end
-
+            
       sale.payment_status = 'void'
       sale.sale_status = 'void'
       sale.save
diff --git a/app/models/sale.rb b/app/models/sale.rb
index b97c529e..969deb5c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -247,6 +247,7 @@ class Sale < ApplicationRecord
 
   #compute - invoice total
   def compute_by_sale_items(sale_id, sale_itemss, total_discount,discount_type=nil)
+
     sale = Sale.find(sale_id)
     sales_items = sale_itemss
 
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index 6827d8e8..bd9022d9 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -587,9 +587,9 @@
 
         var sale_id = $('#sale_id').val();
           type = $('.payment_method').val();
-
-          calculate_member_discount(sale_id,type);
-
+          if (type != "Credit") {
+            calculate_member_discount(sale_id,type);
+          }
           var ajax_url = "/origami/sale/" + sale_id + "/first_bill";
           $.ajax({
               type: "GET",
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 1010101d..c076b81b 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -425,14 +425,14 @@
           var sale_id   = $('#sale_id').text();
           // var item_row  = $('.is_card');
 
-          // if (item_row.length < 1) {
-            calculate_member_discount(sale_id);
-          // }
-         
-            //  payment
-            var cash = $('#cash').text();
+          //  payment
+            var cash   = $('#cash').text();
             var credit = $('#credit').text();
-            var card = $('#card').text();
+            var card   = $('#card').text();
+
+           if (credit <= 0) {
+            calculate_member_discount(sale_id);
+           }
             
             $.ajax({type: "POST",
               url: "<%= origami_payment_cash_path %>",

From ad690c562be5f0a4ce39ac960e38eba8b8f1728b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 29 Dec 2017 09:22:22 +0630
Subject: [PATCH 54/84] update rounding 0 for foc and memberdiscount

---
 app/controllers/origami/payments_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 3ab55be8..7b4bedff 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -263,6 +263,7 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj      = Sale.find(sale_id)
          
       if saleObj.discount_type == "member_discount"
+        sale.update_attributes(rounding_adj: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
       end
       

From 9f04fae6922760efd92a6934cb3e8913de19b575 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 29 Dec 2017 10:00:36 +0630
Subject: [PATCH 55/84] update rouding adj

---
 Gemfile.lock                                   | 2 +-
 app/controllers/origami/payments_controller.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b7804803..05be67ea 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,7 +336,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 2.4.0p0
+   ruby 2.4.1p111
 
 BUNDLED WITH
    1.16.1
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 7b4bedff..96b044f5 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -263,7 +263,7 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj      = Sale.find(sale_id)
          
       if saleObj.discount_type == "member_discount"
-        sale.update_attributes(rounding_adj: 0)
+        sale.update_attributes(rounding_adjustment: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
       end
       

From 86d7eabfc6527c29512f5878e540c4c5ef69aa05 Mon Sep 17 00:00:00 2001
From: Ye Min <yeminphyo@code2lab.com>
Date: Fri, 29 Dec 2017 11:17:36 +0630
Subject: [PATCH 56/84] cap shop.json

---
 Gemfile.lock     | 2 +-
 config/deploy.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b7804803..05be67ea 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -336,7 +336,7 @@ DEPENDENCIES
   whenever
 
 RUBY VERSION
-   ruby 2.4.0p0
+   ruby 2.4.1p111
 
 BUNDLED WITH
    1.16.1
diff --git a/config/deploy.rb b/config/deploy.rb
index 82cbb71e..3020554f 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -12,7 +12,7 @@ set :rbenv_map_bins, %w{rake gem bundle ruby rails}
 
 set :keep_releases, 5
 
-set :linked_files, %w{config/database.yml config/secrets.yml config/puma.rb config/sidekiq.yml}
+set :linked_files, %w{config/database.yml config/secrets.yml config/puma.rb config/sidekiq.yml config/shops.json}
 
 set :linked_dirs, %w{bin log tmp/puma tmp/pids tmp/cache tmp/sockets vendor/bundle public/system pids sockets}
 

From 30dac06c8a43853f931d506b1a9d1f5b70a7ab15 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 29 Dec 2017 12:02:40 +0630
Subject: [PATCH 57/84] add membership type in customer

---
 app/controllers/crm/customers_controller.rb     |  2 ++
 app/controllers/origami/customers_controller.rb |  3 ++-
 app/views/crm/customers/index.html.erb          | 10 ++++++++++
 app/views/origami/customers/index.html.erb      | 12 +++++++++++-
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/app/controllers/crm/customers_controller.rb b/app/controllers/crm/customers_controller.rb
index 51ddc9eb..f917538e 100755
--- a/app/controllers/crm/customers_controller.rb
+++ b/app/controllers/crm/customers_controller.rb
@@ -37,6 +37,8 @@ class Crm::CustomersController < BaseCrmController
     @crm_customer   = Customer.new
     @count_customer = Customer.count_customer
 
+    @membership_types = Lookup.collection_of("member_group_type")
+
     @taxes = TaxProfile.all.order("order_by asc")
 
     @filter = filter
diff --git a/app/controllers/origami/customers_controller.rb b/app/controllers/origami/customers_controller.rb
index 58f70faa..d84dac92 100755
--- a/app/controllers/origami/customers_controller.rb
+++ b/app/controllers/origami/customers_controller.rb
@@ -75,7 +75,8 @@ class Origami::CustomersController < BaseOrigamiController
     # if flash["errors"]
     #   @crm_customer.valid?
     # end
-  
+    @membership_types = Lookup.collection_of("member_group_type")
+
     respond_to do |format|
       # format.html { render :template => "crm/customers/index" }
       format.html { render action: "index"}
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index 2682f203..d05af387 100755
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -52,6 +52,7 @@
                       <th><%= t("views.right_panel.detail.sr_no") %></th>
                       <th><%= t("views.right_panel.detail.name") %></th>
                       <th><%= t("views.right_panel.detail.card_no") %></th>
+                      <th><%= t("views.right_panel.detail.membership_type") %></th>
                       <th style="width:20%"><%= t("views.right_panel.detail.contact_no") %></th>
                       <th style="width:20%"><%= t("views.right_panel.detail.email") %></th>
                       <th><%= t("views.right_panel.detail.action") %></th>
@@ -75,6 +76,15 @@
                           </td>
                           <td><%= crm_customer.name %></td>
                           <td><%= crm_customer.card_no rescue '-' %></td>
+                          <td>
+                            <% if !@membership_types.nil? %>
+                              <% @membership_types.each do |member_type| %>
+                                <% if member_type[1] == crm_customer.membership_type %>
+                                  <%= member_type[0] %>
+                                <% end %>
+                              <% end %>
+                            <% end %>
+                          </td>
                           <td style="width:20px%;word-break: break-all;"><%= crm_customer.contact_no %></td>
                           <td style="width:20px%;word-break: break-all;"><%= crm_customer.email %></td>
                           <td><%= link_to t("views.btn.show"), crm_customer_path(crm_customer) %></td>
diff --git a/app/views/origami/customers/index.html.erb b/app/views/origami/customers/index.html.erb
index 03c73fea..80f90a2d 100755
--- a/app/views/origami/customers/index.html.erb
+++ b/app/views/origami/customers/index.html.erb
@@ -54,6 +54,7 @@
                     <th><%= t("views.right_panel.detail.sr_no") %></th>
                     <th><%= t("views.right_panel.detail.name") %></th>
                     <th><%= t("views.right_panel.detail.card_no") %></th>
+                    <th><%= t("views.right_panel.detail.membership_type") %></th>
                     <th style="width:20%"><%= t("views.right_panel.detail.contact_no") %></th>
                     <th style="width:20%"><%= t("views.right_panel.detail.email") %></th>
                     <!-- <th>Paypar No</th> -->
@@ -76,7 +77,16 @@
                       <% end %>
                     </td>
                     <td><%= crm_customer.name %></td>
-                    <td><%= crm_customer.company rescue '-' %></td>
+                    <td><%= crm_customer.card_no rescue '-' %></td>
+                    <td>
+                      <% if !@membership_types.nil? %>
+                        <% @membership_types.each do |member_type| %>
+                          <% if member_type[1] == crm_customer.membership_type %>
+                            <%= member_type[0] %>
+                          <% end %>
+                        <% end %>
+                      <% end %>
+                    </td>
                     <td style="width:20%;word-break: break-all;"><%= crm_customer.contact_no %></td>
                     <td style="width:20%;word-break: break-all;"><%= crm_customer.email %></td>
                     <!-- <td><%= crm_customer.paypar_account_no %></td> -->

From 26a11ebecd04de0558ce655e2836eb50585435cd Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 29 Dec 2017 14:39:47 +0630
Subject: [PATCH 58/84] add extra charge in oroder

---
 .../origami/addorders_controller.rb           | 25 ++++++++-----------
 app/models/order.rb                           | 19 +++++++++++++-
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index ece423c7..f72bc2ec 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -62,21 +62,23 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
   def create
     Rails.logger.debug "Order Source - " + params[:order_source].to_s
     Rails.logger.debug "Table ID - " + params[:table_id].to_s
-    extra_time = false
-    time = ''
+    is_extra_time = false
+    extra_time = ''
 
     items_arr = []
     JSON.parse(params[:order_items]).each { |i| 
        if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
-         extra_time = true
+         is_extra_time = true
          if i["item_instance_code"] == 'Exti30'
           t = Time.now
-           time = 30*i["quantity"]
+           time = 30*60*i["quantity"].to_i
+           extra_time = Time.at(time).utc.strftime("%H:%M:%S")
            puts time
            puts "timmmmmmmmmmmmmmmmmmm"
          else
           t = Time.now
-           time = 1*i["quantity"]
+           time = 60*60*i["quantity"].to_i
+           extra_time = Time.at(time).utc.strftime("%H:%M:%S")
            puts time
            puts "timmmmmmmmmmmmmmmmmmm"
          end
@@ -94,20 +96,20 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
     @order.guest = params[:guest_info]
     @order.table_id = params[:table_id]  # this is dining facilities's id
     @order.new_booking = true
-    @order.extra_time = true
     @order.waiters = current_login_employee.name
     @order.employee_name = current_login_employee.name
+
+    @order.is_extra_time = is_extra_time
+    @order.extra_time    = extra_time
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil?
           # check booking id is already completed.
           booking = Booking.find(params[:booking_id])
-          puts "ssssssssssssssssssss"
+
           if booking
               if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
                 if !booking.sale_id.nil?
                   sale_status = check_order_with_booking(booking)
-                    puts "WWwwWWWWWWww"
-                    puts sale_status
                   if sale_status
                     return return_json_status_with_code(400, "bill requested")
                   end
@@ -117,18 +119,13 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
                 end
               else
                   sale_status = check_order_with_table(params[:table_id])
-                    puts "OOOOOOOOO"
-                    puts sale_status
                   if sale_status
                     return return_json_status_with_code(400, "bill requested")
                   end
               end
           end #booking exists
       else
-        puts "seeeeeeeeeeeeeeeeee"
         sale_status = check_order_with_table(params[:table_id])
-         # puts "MMMMMMMM"
-         # puts sale_status
         if sale_status
           # return false , @message = "bill requested"
           return return_json_status_with_code(400, "bill requested")
diff --git a/app/models/order.rb b/app/models/order.rb
index 676c129f..e4d58051 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -10,7 +10,7 @@ class Order < ApplicationRecord
   has_many :assigned_order_items
 
   #internal references attributes for business logic control
-  attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id, :extra_time
+  attr_accessor :items, :guest, :table_id, :new_booking, :booking_type, :employee_name, :booking_id, :extra_time, :is_extra_time
   scope :active, -> { where("date BETWEEN '#{DateTime.now.utc.end_of_day}' AND '#{DateTime.now.utc.beginning_of_day}'") }
   #Main Controller method to create new order - validate all inputs and generate new order
   # order_item : {
@@ -28,11 +28,28 @@ class Order < ApplicationRecord
       booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
                                 :checkin_at => Time.now.utc, :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
+      
       table =  DiningFacility.find(self.table_id)
       table.status = "occupied"
       table.save
     else
       booking = Booking.find(self.booking_id)
+      if self.is_extra_time
+        if !booking.checkout_at.nil?
+          puts "sssssssssss"
+          date = booking.checkout_at.strftime("%Y-%m-%d")
+          time = Time.at(booking.checkout_at).utc.strftime("%H:%M:%S")
+          extra_time = self.extra_time
+          new_time = time.strftime("%H") + extra_time.strftime("%H")
+
+          puts time
+          puts extra_time
+          puts new_time
+
+          # booking.update_attributes(checkout_at: )
+        end
+        
+      end
     end
 
     booking.save!

From bbd708e91d35d0d5da7b27d54b78f5c6497bd2ef Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 29 Dec 2017 14:44:01 +0630
Subject: [PATCH 59/84] update foc error for name error

---
 app/controllers/origami/payments_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 96b044f5..0bc77fc3 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -263,7 +263,7 @@ class Origami::PaymentsController < BaseOrigamiController
       saleObj      = Sale.find(sale_id)
          
       if saleObj.discount_type == "member_discount"
-        sale.update_attributes(rounding_adjustment: 0)
+        saleObj.update_attributes(rounding_adjustment: 0)
         saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
       end
       

From 23422aa5a7fccdabbef30cb06ea793b90e59a6dc Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 29 Dec 2017 15:08:48 +0630
Subject: [PATCH 60/84] fix for void and float cal: error

---
 app/controllers/origami/void_controller.rb | 8 +++++---
 app/views/origami/payments/show.html.erb   | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/controllers/origami/void_controller.rb b/app/controllers/origami/void_controller.rb
index ffb2bde4..0ac9df9f 100755
--- a/app/controllers/origami/void_controller.rb
+++ b/app/controllers/origami/void_controller.rb
@@ -42,12 +42,14 @@ class Origami::VoidController < BaseOrigamiController
       table_avaliable = true
       table = sale.bookings[0].dining_facility
       table.bookings.each do |booking|
-        if booking.sale.sale_status == 'new'
-          table_avaliable = false
+        if !booking.sale.nil? 
+          if booking.sale.sale_status == 'new'
+            table_avaliable = false
+          end
         end
       end
 
-      if table_avaliable == true
+      if table_avaliable
         table.status = 'available'
         table.save
       end
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c076b81b..98fd4385 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -369,7 +369,7 @@
         var master1 = $('#mastercount').text();
         var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
         var total = $('#amount_due').text();
-        var amt = parseFloat(total) - othertotal;
+        var amt = parseFloat(total) - parseFloat(othertotal);
         $('#cash').text(amt);
         update_balance();
         break;
@@ -517,7 +517,7 @@
     var master = $('#mastercount').text();
     var amount_due = $('#amount_due').text();
     var total = parseFloat(cash) + parseFloat(credit) + parseFloat(card) + parseFloat(paypar) + parseFloat(visa) + parseFloat(jcb) + parseFloat(master)
-    var result = amount_due - total;
+    var result = parseFloat(amount_due) - parseFloat(total);
     $('#balance').text(result.toFixed(2));
   }
 

From f7c4cb0733c07020f72e038d515b87b09c52412c Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 29 Dec 2017 17:35:01 +0630
Subject: [PATCH 61/84] remove per_spent amt in view_orders

---
 app/views/api/orders/view_orders.json.jbuilder | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/views/api/orders/view_orders.json.jbuilder b/app/views/api/orders/view_orders.json.jbuilder
index 0ac1b92f..9f0b14b3 100755
--- a/app/views/api/orders/view_orders.json.jbuilder
+++ b/app/views/api/orders/view_orders.json.jbuilder
@@ -60,16 +60,16 @@ if (@booking)
   end
 
   # For YGN BBQ
-  if adult_count > 0
-    json.per_adult_spent (adult_spent/adult_count) * 0.05
-  else
+  # if adult_count > 0
+  #   json.per_adult_spent (adult_spent/adult_count) * 0.05
+  # else
     json.per_adult_spent 0
-  end
-  if child_count > 0
-    json.per_child_spent (child_spent/child_count) * 0.05
-  else
+  # end
+  # if child_count > 0
+  #   json.per_child_spent (child_spent/child_count) * 0.05
+  # else
     json.per_child_spent 0
-  end
+  # end
   # End YGN BBQ
 
   json.sub_total @total_amount

From b1fa5f15181e504709683d62ba9cdfc6e4ccf961 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 12:30:57 +0630
Subject: [PATCH 62/84] update add extra time

---
 app/controllers/api/orders_controller.rb      | 21 +++++++++++++
 .../origami/addorders_controller.rb           | 10 ++-----
 app/controllers/origami/sales_controller.rb   |  7 ++++-
 app/models/order.rb                           | 30 ++++++++++---------
 app/models/sale.rb                            |  7 +++--
 app/views/origami/home/show.html.erb          |  6 +++-
 6 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index db6dd039..dd27197c 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -49,7 +49,25 @@ class Api::OrdersController <  Api::ApiController
   def create
     Rails.logger.debug "Order Source - " + params[:order_source].to_s
     Rails.logger.debug "Table ID - " + params[:table_id].to_s
+#for extratime
+    is_extra_time = false
+    extra_time = ''
 
+    params[:order_items].each { |i| 
+       if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
+         is_extra_time = true
+         if i["item_instance_code"] == 'Exti30'
+          t = Time.now
+           time = 30*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)
+         end
+       end
+     }
+#end extra time
     # begin
     @order = Order.new
     @order.source = params[:order_source]
@@ -61,6 +79,9 @@ class Api::OrdersController <  Api::ApiController
     @order.new_booking = true
     @order.waiters = current_login_employee.name
     @order.employee_name = current_login_employee.name
+
+    @order.is_extra_time = is_extra_time
+    @order.extra_time    = extra_time
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil?
         # check booking id is already completed.
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index f72bc2ec..5aedca8c 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -70,17 +70,11 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
        if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
          is_extra_time = true
          if i["item_instance_code"] == 'Exti30'
-          t = Time.now
            time = 30*60*i["quantity"].to_i
-           extra_time = Time.at(time).utc.strftime("%H:%M:%S")
-           puts time
-           puts "timmmmmmmmmmmmmmmmmmm"
+           extra_time = Time.at(time)
          else
-          t = Time.now
            time = 60*60*i["quantity"].to_i
-           extra_time = Time.at(time).utc.strftime("%H:%M:%S")
-           puts time
-           puts "timmmmmmmmmmmmmmmmmmm"
+           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"]}
diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index e5350706..bdf481c2 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -15,9 +15,14 @@ class Origami::SalesController < BaseOrigamiController
     dining = params[:dining_id]
     sale_id = params[:sale_id]
     table = DiningFacility.find(dining)
+    existing_booking = Booking.find_by_sale_id(sale_id)
       table.bookings.each do |booking|
+        # if !booking.checkout_at.nil?
+        #     existing_booking.update_attributes(checkout_at: checkout_at)
+        # end
        if booking.sale_id.nil?
          booking.booking_orders.each do |booking_order|
+          
              booking.booking_status = 'moved'
              order = Order.find(booking_order.order_id)
              order.status = 'billed'
@@ -36,7 +41,7 @@ class Origami::SalesController < BaseOrigamiController
              order.save
              booking.save
          end
-         existing_booking = Booking.find_by_sale_id(sale_id)
+         
          booking_order = BookingOrder.where('booking_id=?',booking)
          booking_order.each do |bo|
            bo.booking_id = existing_booking.booking_id
diff --git a/app/models/order.rb b/app/models/order.rb
index e4d58051..318e8e91 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -25,31 +25,33 @@ class Order < ApplicationRecord
     booking = nil
 
     if self.new_booking
-      booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
+      #add extra time
+      if self.is_extra_time && self.extra_time
+        booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
+                                :checkin_at => Time.now.utc,:checkout_at => Time.now.utc + self.extra_time.to_i,
+                                 :checkin_by =>  self.employee_name,
+                                :booking_status => "assign" })
+      else
+        booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
                                 :checkin_at => Time.now.utc, :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
+      end
+      #end extra time
+     
       
       table =  DiningFacility.find(self.table_id)
       table.status = "occupied"
       table.save
     else
       booking = Booking.find(self.booking_id)
+      #add extra time
       if self.is_extra_time
         if !booking.checkout_at.nil?
-          puts "sssssssssss"
-          date = booking.checkout_at.strftime("%Y-%m-%d")
-          time = Time.at(booking.checkout_at).utc.strftime("%H:%M:%S")
-          extra_time = self.extra_time
-          new_time = time.strftime("%H") + extra_time.strftime("%H")
-
-          puts time
-          puts extra_time
-          puts new_time
-
-          # booking.update_attributes(checkout_at: )
-        end
-        
+          new_time = booking.checkout_at + self.extra_time.to_i
+          booking.update_attributes(checkout_at: new_time)
+        end 
       end
+      #end extra time
     end
 
     booking.save!
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 969deb5c..6d17db0c 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -114,7 +114,10 @@ class Sale < ApplicationRecord
       order.save
 
       booking.sale_id = self.id
-      booking.checkout_at = Time.now.utc.getlocal
+      if booking.checkout_at < Time.now.utc.getlocal
+        booking.checkout_at = Time.now.utc.getlocal
+      end
+      
       booking.checkout_by = requested_by.name
       booking.save      
 
@@ -222,8 +225,6 @@ class Sale < ApplicationRecord
 
     sales_items.each do |item|
       #compute each item and added to total
-      puts "item.sales_item_id ddd"
-      puts item.sale_item_id
       subtotal_price = subtotal_price + item.price
 
       # only calc tax when true
diff --git a/app/views/origami/home/show.html.erb b/app/views/origami/home/show.html.erb
index bd9022d9..29903480 100755
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -143,7 +143,11 @@
                   </div>
               <% elsif @status_sale == 'sale' %>
                   <div><strong id="order-title">INVOICE DETAILS </strong> | Table <%= @dining.name rescue "" %>
-                  <span class="float-right">Checkin Time : <%= @booking.checkin_at.utc.getlocal.strftime("%I:%M %p") %></span>
+                   <% if !@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 %>
                   </div>
               <% else %>
                     <strong id="order-title">ORDER DETAILS </strong> | Table <%= @dining.name rescue "" %>

From e27b468db18ea687252322569fb27d1ffaf7ba3d Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 15:36:03 +0630
Subject: [PATCH 63/84] update request bill with booking.checkout_at nil4

---
 app/models/sale.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 6d17db0c..4b918aab 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -114,8 +114,10 @@ class Sale < ApplicationRecord
       order.save
 
       booking.sale_id = self.id
-      if booking.checkout_at < Time.now.utc.getlocal
-        booking.checkout_at = Time.now.utc.getlocal
+      if !booking.checkout_at.nil?
+        if booking.checkout_at < Time.now.utc.getlocal
+          booking.checkout_at = Time.now.utc.getlocal
+        end
       end
       
       booking.checkout_by = requested_by.name

From 490f651b7fc24e196a2bde17e1be6026491d125c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 16:07:22 +0630
Subject: [PATCH 64/84] update sale model

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

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 4b918aab..507fd2da 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -118,6 +118,8 @@ class Sale < ApplicationRecord
         if booking.checkout_at < Time.now.utc.getlocal
           booking.checkout_at = Time.now.utc.getlocal
         end
+      else
+        booking.checkout_at = Time.now.utc.getlocal
       end
       
       booking.checkout_by = requested_by.name

From e91e15d6292eb8de5fc613dabed60fc3b3a14a62 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 16:28:38 +0630
Subject: [PATCH 65/84] update call waiter

---
 app/controllers/api/call_waiters_controller.rb | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/controllers/api/call_waiters_controller.rb b/app/controllers/api/call_waiters_controller.rb
index a778af12..bfb1023a 100644
--- a/app/controllers/api/call_waiters_controller.rb
+++ b/app/controllers/api/call_waiters_controller.rb
@@ -8,12 +8,11 @@ class Api::CallWaitersController < ActionController::API
     CallWaiterJob.perform_later(@table,@time)
 
     # get printer info
-    # @shop          = Shop::ShopDetail 
-    # unique_code    = "CallWaiterPdf" 
-    # print_settings = PrintSetting.find_by_unique_code(unique_code)
-    # printer        = Printer::ReceiptPrinter.new(print_settings)   
-    # printer.print_call_waiter(print_settings,@table,@time,@shop)
-  
+    @shop          = Shop::ShopDetail 
+    unique_code    = "CallWaiterPdf" 
+    print_settings = PrintSetting.find_by_unique_code(unique_code)
+    printer        = Printer::ReceiptPrinter.new(print_settings)   
+    printer.print_call_waiter(print_settings,@table,@time,@shop)
   end
 
   

From 955b9a806f356fb49427046aee731a2e72cae6a8 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 17:44:18 +0630
Subject: [PATCH 66/84] update extim and extie

---
 README.md                                     |  7 +++++++
 .../origami/addorders_controller.rb           |  4 ++--
 app/views/origami/addorders/detail.html.erb   | 19 ++++++++++---------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 5ff1aeda..0032cc78 100755
--- a/README.md
+++ b/README.md
@@ -33,6 +33,13 @@ ruby 2.4.1p111
 
 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
+Extra Time 
+
+  category_code = Ext001
+  category_code = Ext002
+  instance_code = Extim30, Extim60 //for morning menu
+  instance_code = Extie30, Extie60 //for evening menu
+
 * ToDo list
 
 1. Cloud Sync
diff --git a/app/controllers/origami/addorders_controller.rb b/app/controllers/origami/addorders_controller.rb
index 5aedca8c..1a9aaa9a 100755
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -67,9 +67,9 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
 
     items_arr = []
     JSON.parse(params[:order_items]).each { |i| 
-       if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
+       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30'
          is_extra_time = true
-         if i["item_instance_code"] == 'Exti30'
+         if i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
            time = 30*60*i["quantity"].to_i
            extra_time = Time.at(time)
          else
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index d8909915..050a4a18 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -7,16 +7,17 @@
 <div class="row m-t--20">
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
-            <% @menu.each do |menu|  %>
+            <% @menu.each do |menu| %>
                 <%   if menu.menu_category_id.nil?%>
-                  <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
-                    <p class="hidden menu-id"><%= menu.id  %></p> 
-                    <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                       <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                      </ul>
-                    </a>
-                     
-                  </li>
+                
+                      <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                        <p class="hidden menu-id"><%= menu.id  %></p> 
+                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                          </ul>
+                        </a>
+                      </li>
+                   
                   <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">

From c5eeb9acb7001c204b48171c4f24a039aaa9dbaf Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 18:08:28 +0630
Subject: [PATCH 67/84] update extim and extie

---
 app/controllers/api/orders_controller.rb    |  4 ++--
 app/views/origami/addorders/detail.html.erb | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/controllers/api/orders_controller.rb b/app/controllers/api/orders_controller.rb
index dd27197c..cd8c7ca2 100755
--- a/app/controllers/api/orders_controller.rb
+++ b/app/controllers/api/orders_controller.rb
@@ -54,9 +54,9 @@ class Api::OrdersController <  Api::ApiController
     extra_time = ''
 
     params[:order_items].each { |i| 
-       if i["item_instance_code"] == 'Exti60' || i["item_instance_code"] == 'Exti30'
+       if i["item_instance_code"] == 'Extim60' || i["item_instance_code"] == 'Extim30' || i["item_instance_code"] == 'Extie60' || i["item_instance_code"] == 'Extie30'
          is_extra_time = true
-         if i["item_instance_code"] == 'Exti30'
+         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)
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 050a4a18..c8916e44 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -9,7 +9,7 @@
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
                 <%   if menu.menu_category_id.nil?%>
-                
+                    <% if menu.code != "Ext001" %>
                       <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
@@ -17,7 +17,16 @@
                           </ul>
                         </a>
                       </li>
-                   
+                    <% end%>
+                    <% if @table.get_checkout_booking.nil? && (menu.code == "Ext001" || menu.code == "Ext002") %>
+                      <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                        <p class="hidden menu-id"><%= menu.id  %></p> 
+                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                          </ul>
+                        </a>
+                      </li>
+                    <% end%>
                   <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">

From a9d593a531046c9e09aa06cd052c344b11d4d994 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 18:12:49 +0630
Subject: [PATCH 68/84] update extim and extie

---
 app/views/origami/addorders/detail.html.erb | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index c8916e44..677897b0 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -18,15 +18,7 @@
                         </a>
                       </li>
                     <% end%>
-                    <% if @table.get_checkout_booking.nil? && (menu.code == "Ext001" || menu.code == "Ext002") %>
-                      <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
-                        <p class="hidden menu-id"><%= menu.id  %></p> 
-                        <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
-                           <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
-                          </ul>
-                        </a>
-                      </li>
-                    <% end%>
+                   
                   <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">

From 84be783d1250032826d5a698a196362ce9ec1fee Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 2 Jan 2018 18:13:56 +0630
Subject: [PATCH 69/84] update extim and extie

---
 app/views/origami/addorders/detail.html.erb | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 677897b0..1d29c3c8 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -9,7 +9,6 @@
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
                 <%   if menu.menu_category_id.nil?%>
-                    <% if menu.code != "Ext001" %>
                       <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
@@ -17,8 +16,6 @@
                           </ul>
                         </a>
                       </li>
-                    <% end%>
-                   
                   <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">

From 7ece8cbb470883b2ed806ed5367a8edbd10aaa16 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 3 Jan 2018 10:01:43 +0630
Subject: [PATCH 70/84] update add extra time after request

---
 app/controllers/origami/sales_controller.rb | 13 +++++++------
 app/models/order.rb                         |  5 +++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index bdf481c2..4c00566c 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -16,12 +16,13 @@ class Origami::SalesController < BaseOrigamiController
     sale_id = params[:sale_id]
     table = DiningFacility.find(dining)
     existing_booking = Booking.find_by_sale_id(sale_id)
+
       table.bookings.each do |booking|
-        # if !booking.checkout_at.nil?
-        #     existing_booking.update_attributes(checkout_at: checkout_at)
-        # end
-       if booking.sale_id.nil?
-         booking.booking_orders.each do |booking_order|
+         if !booking.checkout_at.nil? && !booking.sale_id.nil?
+             existing_booking.update_attributes(checkout_at: booking.checkout_at)
+         end
+        if booking.sale_id.nil?
+          booking.booking_orders.each do |booking_order|
           
              booking.booking_status = 'moved'
              order = Order.find(booking_order.order_id)
@@ -40,7 +41,7 @@ class Origami::SalesController < BaseOrigamiController
              saleobj.save
              order.save
              booking.save
-         end
+          end
          
          booking_order = BookingOrder.where('booking_id=?',booking)
          booking_order.each do |bo|
diff --git a/app/models/order.rb b/app/models/order.rb
index 318e8e91..6b6bd158 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -27,8 +27,10 @@ class Order < ApplicationRecord
     if self.new_booking
       #add extra time
       if self.is_extra_time && self.extra_time
+        old_booking = Booking.where("booking_id = #{self.booking_id} and sale_id NOT NULL").first
+        new_time = old_booking.checkout_at + self.extra_time.to_i
         booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
-                                :checkin_at => Time.now.utc,:checkout_at => Time.now.utc + self.extra_time.to_i,
+                                :checkin_at => Time.now.utc,:checkout_at => new_time,
                                  :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
       else
@@ -37,7 +39,6 @@ class Order < ApplicationRecord
                                 :booking_status => "assign" })
       end
       #end extra time
-     
       
       table =  DiningFacility.find(self.table_id)
       table.status = "occupied"

From c8b7417f6a9b11526fad132dab4a80e404f5f067 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 3 Jan 2018 10:12:22 +0630
Subject: [PATCH 71/84] update extra time

---
 app/controllers/origami/sales_controller.rb | 13 ++++++-------
 app/models/order.rb                         |  5 ++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/controllers/origami/sales_controller.rb b/app/controllers/origami/sales_controller.rb
index 4c00566c..bdf481c2 100755
--- a/app/controllers/origami/sales_controller.rb
+++ b/app/controllers/origami/sales_controller.rb
@@ -16,13 +16,12 @@ class Origami::SalesController < BaseOrigamiController
     sale_id = params[:sale_id]
     table = DiningFacility.find(dining)
     existing_booking = Booking.find_by_sale_id(sale_id)
-
       table.bookings.each do |booking|
-         if !booking.checkout_at.nil? && !booking.sale_id.nil?
-             existing_booking.update_attributes(checkout_at: booking.checkout_at)
-         end
-        if booking.sale_id.nil?
-          booking.booking_orders.each do |booking_order|
+        # if !booking.checkout_at.nil?
+        #     existing_booking.update_attributes(checkout_at: checkout_at)
+        # end
+       if booking.sale_id.nil?
+         booking.booking_orders.each do |booking_order|
           
              booking.booking_status = 'moved'
              order = Order.find(booking_order.order_id)
@@ -41,7 +40,7 @@ class Origami::SalesController < BaseOrigamiController
              saleobj.save
              order.save
              booking.save
-          end
+         end
          
          booking_order = BookingOrder.where('booking_id=?',booking)
          booking_order.each do |bo|
diff --git a/app/models/order.rb b/app/models/order.rb
index 6b6bd158..318e8e91 100755
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -27,10 +27,8 @@ class Order < ApplicationRecord
     if self.new_booking
       #add extra time
       if self.is_extra_time && self.extra_time
-        old_booking = Booking.where("booking_id = #{self.booking_id} and sale_id NOT NULL").first
-        new_time = old_booking.checkout_at + self.extra_time.to_i
         booking = Booking.create({:dining_facility_id => self.table_id,:type => "TableBooking",
-                                :checkin_at => Time.now.utc,:checkout_at => new_time,
+                                :checkin_at => Time.now.utc,:checkout_at => Time.now.utc + self.extra_time.to_i,
                                  :checkin_by =>  self.employee_name,
                                 :booking_status => "assign" })
       else
@@ -39,6 +37,7 @@ class Order < ApplicationRecord
                                 :booking_status => "assign" })
       end
       #end extra time
+     
       
       table =  DiningFacility.find(self.table_id)
       table.status = "occupied"

From 09db9656c58d912a881bd4f3307313b4ee66fe7f Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Wed, 3 Jan 2018 12:22:09 +0630
Subject: [PATCH 72/84] update sale item desc

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

diff --git a/app/models/sale.rb b/app/models/sale.rb
index 507fd2da..7adb1324 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -665,7 +665,7 @@ 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("i.product_name").order("mi.account_id desc")
+  query = query.group("i.product_name").order("acc.title desc")
 end
 
 def self.get_other_charges()

From ae6caefaa06c3daa504754e9d45a7f209b302923 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 5 Jan 2018 13:33:23 +0630
Subject: [PATCH 73/84] change query in sale item report

---
 app/controllers/reports/saleitem_controller.rb | 5 ++++-
 app/models/sale.rb                             | 2 +-
 app/views/reports/saleitem/index.html.erb      | 9 ++++-----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 7e7469f9..4a6a4440 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -25,7 +25,7 @@ class Reports::SaleitemController < BaseReportController
     @sale_data.each {|acc_cate| @account_cate_count[acc_cate.account_id] += 1}
 
     @menu_cate_count = Hash.new {|hash, key| hash[key] = 0}
-    @sale_data.each {|cate| @menu_cate_count[cate.menu_category_id] += 1}
+    @sale_data.each {|cate| @menu_cate_count[cate.account_id] += 1}
 
 
     @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
@@ -64,6 +64,9 @@ class Reports::SaleitemController < BaseReportController
         date_arr.push(str)
       end
 
+      @totalByAccount = Hash.new {|hash, key| hash[key] = 0}
+      @sale_data.each {|acc| @totalByAccount[acc.account_id] += acc.grand_total}
+
       out = {:status => 'ok', :message => date_arr}
       
       respond_to do |format|
diff --git a/app/models/sale.rb b/app/models/sale.rb
index 7adb1324..69aa930a 100755
--- a/app/models/sale.rb
+++ b/app/models/sale.rb
@@ -665,7 +665,7 @@ 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("i.product_name").order("acc.title desc")
+  query = query.group("acc.title,mi.account_id,i.product_name").order("acc.title desc, mi.account_id desc")
 end
 
 def self.get_other_charges()
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index d0def563..f780acdb 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -110,9 +110,8 @@
 								</tr>
 								<!-- sub total -->
 
-								<% @menu_cate_count.each do |key,value| %>
-								<% if sale.menu_category_id == key %>
-
+							<% @menu_cate_count.each do |key,value| %>
+								<% if sale.account_id == key %>
 								    <% count = count + 1 %>	
 								    <% sub_total += sale.grand_total %>
 								    <% sub_qty += sale.total_item %>
@@ -128,10 +127,10 @@
 										<% sub_qty = 0 %>
 										<% count = 0%>
 									<% end %>
-							      <% end %>
 							    <% end %>
-							<!-- end sub total -->
 							<% end %>
+							<!-- end sub total -->
+						<% end %>
 							<!--Other Charges -->
 							<% if @other_charges.present? %>
 							   <tr>

From b6134e22cabeafc5e8db001a5d5fcdccff5b5d01 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 5 Jan 2018 14:14:15 +0630
Subject: [PATCH 74/84] add slim OrderItemPdf and OrderSummaryPdf , how to?

---
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index 0032cc78..af0a9252 100755
--- a/README.md
+++ b/README.md
@@ -40,6 +40,15 @@ Extra Time
   instance_code = Extim30, Extim60 //for morning menu
   instance_code = Extie30, Extie60 //for evening menu
 
+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
+
 * ToDo list
 
 1. Cloud Sync

From 854d3785756d271c712cee1e22f8d6b45fd93312 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 5 Jan 2018 16:32:34 +0630
Subject: [PATCH 75/84] check extra cat: ; is it checked in or not?

---
 README.md                                   |  4 ++--
 app/views/origami/addorders/detail.html.erb | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index af0a9252..46af5ba1 100755
--- a/README.md
+++ b/README.md
@@ -35,8 +35,8 @@ java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
 Extra Time 
 
-  category_code = Ext001
-  category_code = Ext002
+  category_code = ExtC001 //for morning menu cat:
+  category_code = ExtC002 //for evening menu cat:
   instance_code = Extim30, Extim60 //for morning menu
   instance_code = Extie30, Extie60 //for evening menu
 
diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 1d29c3c8..2e160a7f 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -8,7 +8,9 @@
     <div class="col-lg-2 col-md-2 col-sm-2">
         <ul class="nav nav-tabs flex-column" role="tablist" >
             <% @menu.each do |menu| %>
-                <%   if menu.menu_category_id.nil?%>
+                <% if menu.menu_category_id.nil? %>
+                  <% if @table.get_current_checkout_booking.nil? %>
+                    <% if menu.code != 'ExtC001' && menu.code != 'ExtC002' %>
                       <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
@@ -16,7 +18,17 @@
                           </ul>
                         </a>
                       </li>
+                    <% end%>
+                  <% else %>
+                    <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
+                      <p class="hidden menu-id"><%= menu.id  %></p> 
+                      <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>
+                         <ul class=" sub_category_list hidden fadeInTop animated" id="sub_category_list">
+                        </ul>
+                      </a>
+                    </li>
                   <% end%>
+              <% end%>
             <%end %>
             <!-- <li class="nav-item menu_category">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown">Menu 1 <b class="caret"></b></a>

From 4a9030d441cf6c3103c38f2fbd58cab32dd4f167 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Fri, 5 Jan 2018 18:12:13 +0630
Subject: [PATCH 76/84] check menu cat: for person

---
 app/views/origami/addorders/detail.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/origami/addorders/detail.html.erb b/app/views/origami/addorders/detail.html.erb
index 2e160a7f..bebf18cc 100755
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -10,7 +10,7 @@
             <% @menu.each do |menu| %>
                 <% if menu.menu_category_id.nil? %>
                   <% if @table.get_current_checkout_booking.nil? %>
-                    <% if menu.code != 'ExtC001' && menu.code != 'ExtC002' %>
+                    <% if !menu.code.include? "SPL" %>
                       <li class="nav-item menu_category sub_click" data-id="<%=menu.id%>">
                         <p class="hidden menu-id"><%= menu.id  %></p> 
                         <a class="nav-link" data-toggle="tab" href="" role="tab"> <%= menu.name%>

From 014a07163768673e36cbf8b0eaa2804bfcd8a758 Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Mon, 8 Jan 2018 09:53:49 +0630
Subject: [PATCH 77/84] add menu categories code for person and extra time

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 46af5ba1..3412e2ed 100755
--- a/README.md
+++ b/README.md
@@ -33,10 +33,10 @@ ruby 2.4.1p111
 
 java -jar ~/Documents/Jade.jar http://192.168.1.88:3002
 
+Person and Extra Time
+  category_code = SPL... //for menu categories
+  
 Extra Time 
-
-  category_code = ExtC001 //for morning menu cat:
-  category_code = ExtC002 //for evening menu cat:
   instance_code = Extim30, Extim60 //for morning menu
   instance_code = Extie30, Extie60 //for evening menu
 

From cd2f9fdcb0df433115af96e5edf4c844d2c15f6b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 8 Jan 2018 17:00:00 +0630
Subject: [PATCH 78/84] update precision and delimetor all

---
 .../reports/commission_controller.rb          |   3 +-
 .../reports/credit_payment_controller.rb      |   3 +-
 .../reports/dailysale_controller.rb           |   2 +
 .../reports/payment_method_controller.rb      |   3 +-
 .../reports/receipt_no_controller.rb          |   3 +-
 .../reports/saleitem_controller.rb            |   3 +
 .../reports/shiftsale_controller.rb           |   3 +-
 .../reports/stock_check_controller.rb         |   3 +-
 .../reports/void_sale_controller.rb           |   3 +-
 app/models/customer.rb                        | 145 +++++++++++++-----
 app/models/print_setting.rb                   |   4 +
 app/models/sale_payment.rb                    |   2 +-
 app/pdf/close_cashier_pdf.rb                  |  62 +++++---
 app/views/reports/commission/index.html.erb   |  24 ++-
 .../reports/credit_payment/index.html.erb     |  14 +-
 app/views/reports/dailysale/index.html.erb    |  66 ++++----
 .../reports/payment_method/index.html.erb     |  36 +++--
 app/views/reports/receipt_no/index.html.erb   |  42 +++--
 app/views/reports/saleitem/index.html.erb     |  38 +++--
 app/views/reports/shiftsale/index.html.erb    |  32 ++--
 app/views/reports/void_sale/index.html.erb    |  28 +++-
 21 files changed, 360 insertions(+), 159 deletions(-)

diff --git a/app/controllers/reports/commission_controller.rb b/app/controllers/reports/commission_controller.rb
index aeaa0a11..e97a1a77 100755
--- a/app/controllers/reports/commission_controller.rb
+++ b/app/controllers/reports/commission_controller.rb
@@ -19,7 +19,8 @@ class Reports::CommissionController < BaseReportController
   
     @from       = from_date
     @to         = to_date
-
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
     respond_to do |format|
       format.html
       format.xls
diff --git a/app/controllers/reports/credit_payment_controller.rb b/app/controllers/reports/credit_payment_controller.rb
index dd9b3987..3b716cc2 100755
--- a/app/controllers/reports/credit_payment_controller.rb
+++ b/app/controllers/reports/credit_payment_controller.rb
@@ -21,7 +21,8 @@ authorize_resource :class => false
        
         @from       = from
         @to         = to
-
+        # get printer info
+        @print_settings = PrintSetting.get_precision_delimiter()
         if @shift.present?
 	      @shift.each do |sh|
 	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
diff --git a/app/controllers/reports/dailysale_controller.rb b/app/controllers/reports/dailysale_controller.rb
index fc1f150f..e2102d87 100755
--- a/app/controllers/reports/dailysale_controller.rb
+++ b/app/controllers/reports/dailysale_controller.rb
@@ -8,6 +8,8 @@ class Reports::DailysaleController < BaseReportController
   @from       = from
   @to         = to
 
+  # get printer info
+  @print_settings = PrintSetting.get_precision_delimiter()
 	respond_to do |format|
       format.html
       format.xls
diff --git a/app/controllers/reports/payment_method_controller.rb b/app/controllers/reports/payment_method_controller.rb
index bbff8900..01a904ae 100644
--- a/app/controllers/reports/payment_method_controller.rb
+++ b/app/controllers/reports/payment_method_controller.rb
@@ -23,7 +23,8 @@ class Reports::PaymentMethodController < BaseReportController
         @sale_data,@pyament_method = Sale.get_payment_method_by_shift(@shift_sale_range,@shift,from,to,@payment_type) 
         @from       = from
         @to         = to
-
+        # get printer info
+        @print_settings = PrintSetting.get_precision_delimiter()
         if @shift.present?
 	      @shift.each do |sh|
 	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
diff --git a/app/controllers/reports/receipt_no_controller.rb b/app/controllers/reports/receipt_no_controller.rb
index 2bd5e813..faa12eae 100755
--- a/app/controllers/reports/receipt_no_controller.rb
+++ b/app/controllers/reports/receipt_no_controller.rb
@@ -23,7 +23,8 @@ authorize_resource :class => false
         @tax_profiles = TaxProfile.order('order_by asc')
         @from       = from
         @to         = to
-
+        # get printer info
+        @print_settings = PrintSetting.get_precision_delimiter()
         if @shift.present?
 	      @shift.each do |sh|
 	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
diff --git a/app/controllers/reports/saleitem_controller.rb b/app/controllers/reports/saleitem_controller.rb
index 4a6a4440..a9d23797 100755
--- a/app/controllers/reports/saleitem_controller.rb
+++ b/app/controllers/reports/saleitem_controller.rb
@@ -34,6 +34,9 @@ class Reports::SaleitemController < BaseReportController
     @from       = from
     @to         = to
 
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
+
     if shift.present?
       shift.each do |sh|
         @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
diff --git a/app/controllers/reports/shiftsale_controller.rb b/app/controllers/reports/shiftsale_controller.rb
index 5bc2020c..f9373374 100755
--- a/app/controllers/reports/shiftsale_controller.rb
+++ b/app/controllers/reports/shiftsale_controller.rb
@@ -17,7 +17,8 @@ class Reports::ShiftsaleController < BaseReportController
           @shift_to = @shift.shift_closed_at.nil? ? '-' : @shift.shift_closed_at.utc.getlocal.strftime("%e %b %I:%M%p")
           @shift_data = @shift
     end
-
+    # get printer info
+    @print_settings = PrintSetting.get_precision_delimiter()
 	  respond_to do |format|
       format.html
       format.xls
diff --git a/app/controllers/reports/stock_check_controller.rb b/app/controllers/reports/stock_check_controller.rb
index c9622999..a9188f5d 100755
--- a/app/controllers/reports/stock_check_controller.rb
+++ b/app/controllers/reports/stock_check_controller.rb
@@ -16,7 +16,8 @@ class Reports::StockCheckController < BaseReportController
     @transaction = StockCheckItem.get_transaction(from_date, to_date, @item_code)
     @from       = from_date
     @to         = to_date
-
+    # get printer info
+  @print_settings = PrintSetting.get_precision_delimiter()
     respond_to do |format|
       format.html
       format.xls
diff --git a/app/controllers/reports/void_sale_controller.rb b/app/controllers/reports/void_sale_controller.rb
index 80526ad0..6169dadc 100755
--- a/app/controllers/reports/void_sale_controller.rb
+++ b/app/controllers/reports/void_sale_controller.rb
@@ -20,7 +20,8 @@ authorize_resource :class => false
        
         @from       = from
         @to         = to
-
+        # get printer info
+        @print_settings = PrintSetting.get_precision_delimiter()
         if @shift.present?
 	      @shift.each do |sh|
 	        @shift_from = sh.shift_started_at.nil? ? '-' : sh.shift_started_at.utc.getlocal.strftime("%e %b %I:%M%p")
diff --git a/app/models/customer.rb b/app/models/customer.rb
index 8865448f..c228e3e6 100755
--- a/app/models/customer.rb
+++ b/app/models/customer.rb
@@ -146,7 +146,7 @@ class Customer < ApplicationRecord
       if sale.customer.membership_id
           response = self.rebat(Sale.find(sale.sale_id))
            #record an payment in sale-audit
-            remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.received_amount} "
+            remark = "UPdate Rebate Response - #{response} for Customer #{sale.customer_id} Sale Id [#{sale.sale_id}]| pay amount -> #{sale.amount_received} "
             sale_audit = SaleAudit.record_paymal(sale.sale_id, remark, 1)   
 
            if response["status"] == true
@@ -157,66 +157,137 @@ class Customer < ApplicationRecord
   end
 
   def self.rebat(sObj)
-    rebate_prices = SaleItem.calculate_rebate_by_account(sObj.sale_items)
-
+    rebate_prices,campaign_method = SaleItem.calculate_rebate_by_account(sObj.sale_items)
     generic_customer_id = sObj.customer.membership_id
     if generic_customer_id.present?
-      paypar = sObj.sale_payments
+
+      paypar     = sObj.sale_payments
       payparcost = 0
-      credit = 0
+      credit     = 0
+
       paypar.each do |pp|
         if pp.payment_method == "paypar"
           payparcost = payparcost + pp.payment_amount
-        elsif pp.payment_method == "creditnote"
+        end
+        if pp.payment_method == "creditnote"
           credit = 1
         end
       end
-  
       # overall_dis = SaleItem.get_overall_discount(sObj.id)
-      overall_dis = sObj.total_discount
-
-      total_amount = rebate_prices - payparcost - overall_dis
-
-      if credit == 1
-        total_amount = 0
-      end
-      if total_amount >= 0
-        receipt_no = sObj.receipt_no
-        membership      = MembershipSetting.find_by_membership_type("paypar_url")
-        memberaction    = MembershipAction.find_by_membership_type("rebate")
-        merchant_uid    = memberaction.merchant_account_id.to_s
-        campaign_type_id = memberaction.additional_parameter["campaign_type_id"]
-        auth_token       = memberaction.auth_token.to_s
-        url             = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+      overall_dis   = sObj.total_discount
+      
+      if credit != 1
+        membership        = MembershipSetting.find_by_membership_type("paypar_url")
+        memberaction      = MembershipAction.find_by_membership_type("get_member_campaign")
+        merchant_uid      = memberaction.merchant_account_id.to_s
+        campaign_type_id  = memberaction.additional_parameter["campaign_type_id"]
+        auth_token        = memberaction.auth_token.to_s
+        url               = membership.gateway_url.to_s + memberaction.gateway_url.to_s
 
         # Control for Paypar Cloud
         begin
-          response        = HTTParty.post(url, :body => { generic_customer_id:generic_customer_id ,
-                             total_sale_transaction_amount: sObj.grand_total,
-                             merchant_uid:merchant_uid,
-                             total_amount: total_amount,
-                             campaign_type_id: campaign_type_id,
-                              receipt_no: receipt_no,
-                              auth_token:auth_token}.to_json,
-                         :headers => {
+          response = HTTParty.get(url, 
+                                :body => { 
+                                  member_group_id:sObj.customer.membership_type,
+                                  merchant_uid:merchant_uid,
+                                  campaign_type_id: campaign_type_id,
+                                  auth_token:auth_token
+                                }.to_json,
+                                :headers => {
                                   'Content-Type' => 'application/json',
-                                   'Accept'       => 'application/json; version=2'
-                          }, :timeout => 10)
+                                  'Accept'       => 'application/json; version=2'
+                                }, :timeout => 10)
         rescue Net::OpenTimeout
            response = { "status": false , "message": "Connect To" }
-        
-
         rescue OpenURI::HTTPError
            response = { "status": false, "message": "Can't connect server"}
           
         rescue SocketError
            response = { "status": false, "message": "Can't connect server"}
+        end
+
+        redeem_amount = payparcost + overall_dis
+
+        total_percentage = 0
+
+        type_arr = []
+        Rails.logger.debug "Get Member Campaign"
+        Rails.logger.debug response.to_json
+        # Check for present response fields
+        if response["membership_campaign_data"].present?
+          response["membership_campaign_data"].each do |a|
+            data = {:type => a["rules_type"], :percentage => a["change_unit"].to_i * a["base_unit"].to_i}
+            total_percentage = total_percentage + a["change_unit"].to_i * a["base_unit"].to_i
           
+            type_arr.push(data)
+          end
         end
-        return response    
-        Rails.logger.debug "--------Update Rebate response -------"
-        Rails.logger.debug response.to_json  
+
+        rebate_arr =[]
+        campaign_method.each do |a|
+          data = {:type => a[:type], :amount => a[:amount]}
+          type_arr.each do |si|
+            if si[:type] == a[:type]
+              if credit == 1
+                 data[:amount] = 0
+              else
+                amount = (redeem_amount / total_percentage)*si[:percentage]
+                actual = a[:amount] - amount
+                data[:amount] = actual
+              end
+              
+            end
+          end
+          rebate_arr.push(data)
         end
+
+        total_amount = rebate_prices - payparcost - overall_dis
+
+        if credit == 1
+          total_amount = 0
+        end
+
+        if total_amount >= 0
+          receipt_no        = sObj.receipt_no
+          membership        = MembershipSetting.find_by_membership_type("paypar_url")
+          memberaction      = MembershipAction.find_by_membership_type("rebate")
+          merchant_uid      = memberaction.merchant_account_id.to_s
+          campaign_type_id  = memberaction.additional_parameter["campaign_type_id"]
+          auth_token        = memberaction.auth_token.to_s
+          url               = membership.gateway_url.to_s + memberaction.gateway_url.to_s
+
+          # Control for Paypar Cloud
+          begin
+            response = HTTParty.post(url, 
+                                  :body => { 
+                                    generic_customer_id:generic_customer_id ,
+                                    total_sale_transaction_amount: sObj.grand_total,
+                                    merchant_uid:merchant_uid,
+                                    total_amount: total_amount,
+                                    campaign_type_id: campaign_type_id,
+                                    receipt_no: receipt_no,
+                                    campaign_method: rebate_arr.to_json,
+                                    auth_token:auth_token
+                                  }.to_json,
+                                  :headers => {
+                                    'Content-Type' => 'application/json',
+                                    'Accept'       => 'application/json; version=2'
+                                  }, :timeout => 10)
+          rescue Net::OpenTimeout
+             response = { "status": false , "message": "Connect To" }
+          rescue OpenURI::HTTPError
+             response = { "status": false, "message": "Can't connect server"}
+            
+          rescue SocketError
+             response = { "status": false, "message": "Can't connect server"}
+          end
+          Rails.logger.debug "Rebage Response"
+          Rails.logger.debug response.to_json
+          return response
+        end
+      end
+    else
+       response = { "status": "no_member", "message": "Not membership"}  
     end
   end
 
diff --git a/app/models/print_setting.rb b/app/models/print_setting.rb
index a13229dc..b4f17a62 100755
--- a/app/models/print_setting.rb
+++ b/app/models/print_setting.rb
@@ -1,4 +1,8 @@
 class PrintSetting < ApplicationRecord
 	# validations
 	validates_presence_of :name, :unique_code, :printer_name, :page_width, :page_height, :print_copies
+
+	def self.get_precision_delimiter
+		PrintSetting.find_by_unique_code("CloseCashierPdf")
+	end
 end
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index f9d16873..8cb33c80 100755
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -450,7 +450,7 @@ class SalePayment < ApplicationRecord
                                   'Accept'       => 'application/json; version=2'
                                 }, :timeout => 10)
         rescue Net::OpenTimeout
-           response = { "status": false , "message": "Connect To" }
+           response = { "status": false , "message": " Connection timeout" }
         rescue OpenURI::HTTPError
            response = { "status": false, "message": "Can't connect server"}
           
diff --git a/app/pdf/close_cashier_pdf.rb b/app/pdf/close_cashier_pdf.rb
index 93cd7ab9..d84b0366 100755
--- a/app/pdf/close_cashier_pdf.rb
+++ b/app/pdf/close_cashier_pdf.rb
@@ -1,4 +1,5 @@
 class CloseCashierPdf < Prawn::Document
+  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,:text_width
 
   def initialize(printer_settings, shift_sale,shop_details,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount)
@@ -38,11 +39,22 @@ class CloseCashierPdf < Prawn::Document
     self.header_font_size = 10
     self.item_font_size = 8
 
+    #precision checked
+    if printer_settings.precision.to_i > 2
+        printer_settings.precision = 2
+    end
+    #check delimiter
+    if printer_settings.delimiter
+        delimiter = ","
+    else
+        delimiter = ""
+    end
+
     header( shop_details)
 
     stroke_horizontal_rule
 
-    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount) 
+    shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,printer_settings.precision,delimiter) 
   end
 
   def header (shop_details)
@@ -58,7 +70,7 @@ class CloseCashierPdf < Prawn::Document
     stroke_horizontal_rule
   end
 
-  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount)
+  def shift_detail(shift_sale,sale_taxes,other_payment,total_amount_by_account,total_discount_by_account,total_member_discount,precision,delimiter)
         move_down 7
          y_position = cursor
         bounding_box([0,y_position], :width =>self.label_width, :height => self.item_height) do
@@ -97,7 +109,7 @@ class CloseCashierPdf < Prawn::Document
             text "Opening Float : ", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ shift_sale.opening_balance}" , :size => self.item_font_size,:align => :left
+            text "#{ number_with_precision(shift_sale.opening_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
         end
 
         y_position = cursor
@@ -105,7 +117,8 @@ class CloseCashierPdf < Prawn::Document
             text "Closing Float : ", :size => self.item_font_size,:align => :left
         end
         bounding_box([self.label_width,y_position], :width => self.label_width, :height => self.item_height) do
-            text "#{ shift_sale.closing_balance}" , :size => self.item_font_size,:align => :left
+            text "#{ number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :left
+            # text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}"
         end
 
 
@@ -122,7 +135,8 @@ class CloseCashierPdf < Prawn::Document
          text "Received Amount :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.closing_balance}", :size => self.item_font_size, :align => :right
+         text "#{number_with_precision(shift_sale.closing_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
+
         end
 
         y_position = cursor
@@ -130,7 +144,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash In:", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.cash_in}", :size => self.item_font_size, :align => :right
+         text "#{number_with_precision(shift_sale.cash_in, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -138,7 +152,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash Out:", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.cash_out}", :size => self.item_font_size, :align => :right
+         text "#{number_with_precision(shift_sale.cash_out, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         move_down -5
@@ -151,7 +165,7 @@ class CloseCashierPdf < Prawn::Document
          text "Cash Payment :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.cash_sales}", :size => self.item_font_size, :align => :right
+         text "#{ number_with_precision(shift_sale.cash_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -159,7 +173,7 @@ class CloseCashierPdf < Prawn::Document
          text "Credit Payment :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.credit_sales}", :size => self.item_font_size, :align => :right
+         text "#{number_with_precision(shift_sale.credit_sales, :precision => precision.to_i, :delimiter => delimiter) }", :size => self.item_font_size, :align => :right
         end
         #start other payment details 
         if shift_sale.other_sales > 0
@@ -170,7 +184,7 @@ class CloseCashierPdf < Prawn::Document
                text "MPU Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.mpu_amount.round(2)}", :size => self.item_font_size, :align => :right
+               text "#{ number_with_precision(other.mpu_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
 
               y_position = cursor
@@ -178,7 +192,7 @@ class CloseCashierPdf < Prawn::Document
                text "VISA Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.visa_amount.round(2)}", :size => self.item_font_size, :align => :right
+               text "#{number_with_precision(other.visa_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
 
               y_position = cursor
@@ -186,7 +200,7 @@ class CloseCashierPdf < Prawn::Document
                text "Master Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.master_amount.round(2)}", :size => self.item_font_size, :align => :right
+               text "#{ number_with_precision(other.master_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
 
               y_position = cursor
@@ -194,7 +208,7 @@ class CloseCashierPdf < Prawn::Document
                text "JCB Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.jcb_amount.round(2)}", :size => self.item_font_size, :align => :right
+               text "#{ number_with_precision(other.jcb_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
 
               y_position = cursor
@@ -202,7 +216,7 @@ class CloseCashierPdf < Prawn::Document
                text "Reedem Payment :", :size => self.item_font_size, :align => :right
               end
               bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-               text "#{other.paypar_amount.round(2)}", :size => self.item_font_size, :align => :right
+               text "#{ number_with_precision(other.paypar_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
               end
             end
         else
@@ -211,7 +225,7 @@ class CloseCashierPdf < Prawn::Document
              text "Other Payment :", :size => self.item_font_size, :align => :right
             end
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{shift_sale.other_sales}", :size => self.item_font_size, :align => :right
+             text "#{ number_with_precision(shift_sale.other_sales, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
             end
         end
 
@@ -220,7 +234,7 @@ class CloseCashierPdf < Prawn::Document
          text "Rounding Adjustments :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.total_rounding.round(2)}", :size => self.item_font_size, :align => :right
+         text "#{ number_with_precision(shift_sale.total_rounding, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -228,7 +242,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.grand_total.round(2)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
+         text "#{ number_with_precision(shift_sale.grand_total, :precision => precision.to_i, :delimiter => delimiter)}", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
 
         # end other payment details 
@@ -243,7 +257,7 @@ class CloseCashierPdf < Prawn::Document
            text "#{tax.tax_name} :", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{tax.st_amount.round(2)}", :size => self.item_font_size, :align => :right
+           text "#{ number_with_precision(tax.st_amount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
           end
         end
 
@@ -252,7 +266,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Taxes :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.total_taxes}", :size => self.item_font_size, :align => :right
+         text "#{ number_with_precision(shift_sale.total_taxes, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end
 
         y_position = cursor
@@ -260,7 +274,7 @@ class CloseCashierPdf < Prawn::Document
          text "Net Sales :", :style => :bold, :size => self.header_font_size - 1, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{shift_sale.nett_sales}", :style => :bold , :size => self.header_font_size - 1, :align => :right
+         text "#{number_with_precision(shift_sale.nett_sales, :precision => precision.to_i, :delimiter => delimiter) }", :style => :bold , :size => self.header_font_size - 1, :align => :right
         end
         #end for service charges and commercial tax
 #COMMENTED FOR NO NEED AND NOT CORRECT WHEN OTHER CHARGES
@@ -283,7 +297,7 @@ class CloseCashierPdf < Prawn::Document
            text "Total #{amount.account_name} Discount:", :size => self.item_font_size, :align => :right
           end
           bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-           text "#{amount.total_price.round(2)} ", :size => self.item_font_size, :align => :right
+           text "#{ number_with_precision(amount.total_price, :precision => precision.to_i, :delimiter => delimiter)} ", :size => self.item_font_size, :align => :right
           end
         end
         #end total amount by Account 
@@ -297,7 +311,7 @@ class CloseCashierPdf < Prawn::Document
              text "Total Member Discount :", :size => self.item_font_size, :align => :right
             end
             bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-             text "#{@member_discount}", :size => self.item_font_size, :align => :right
+             text "#{ number_with_precision(@member_discount, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
             end
         else 
           @overall = shift_sale.total_discounts                   
@@ -308,7 +322,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total Discount :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "#{@overall}", :size => self.item_font_size, :align => :right
+         text "#{ number_with_precision(@overall, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size, :align => :right
         end 
 
         y_position = cursor
@@ -316,7 +330,7 @@ class CloseCashierPdf < Prawn::Document
          text "Total FOC :", :size => self.item_font_size, :align => :right
         end
         bounding_box([self.item_description_width,y_position], :width =>self.price_width, :height => 20) do
-         text "(#{@total_foc})", :size => self.item_font_size, :align => :right
+         text "(#{ number_with_precision(@total_foc, :precision => precision.to_i, :delimiter => delimiter)})", :size => self.item_font_size, :align => :right
         end     
 
         y_position = cursor
diff --git a/app/views/reports/commission/index.html.erb b/app/views/reports/commission/index.html.erb
index 2586018d..80cf5727 100755
--- a/app/views/reports/commission/index.html.erb
+++ b/app/views/reports/commission/index.html.erb
@@ -43,6 +43,18 @@
         </tr>
         </thead>
         <tbody>
+        <% if @print_settings.precision.to_i > 0
+              precision = @print_settings.precision
+              else
+                precision = 0
+              end
+               #check delimiter
+              if @print_settings.delimiter
+                delimiter = ","
+            else
+                delimiter = ""
+            end
+             %> 
         <% total_qty = 0 %>
         <% total_price = 0 %>
         <% total_amount = 0 %>
@@ -53,9 +65,9 @@
               <td><%= result.sale_item_id rescue '-' %></td>
               <td><%= result.commissioner.name rescue '-' %></td>
               <td><%= result.commission.menu_item.name rescue '-' %></td>
-              <td><%= sprintf "%.2f", result.qty.to_f.to_d rescue '-' %></td>
-              <td><%= sprintf "%.2f", result.price.to_f.to_d rescue '-' %></td>
-              <td><%= sprintf "%.2f", result.amount.to_f.to_d rescue '-' %></td>
+              <td><%= number_with_precision(result.qty.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_with_precision(result.price.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+              <td><%= number_with_precision(result.amount.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
               <td><%= result.updated_at.strftime("%e %b %Y %I:%M%p") rescue '-' %></td>
             </tr>
             <% total_qty += result.qty.to_f %>
@@ -65,9 +77,9 @@
 
         <tr style="border-top: 3px solid grey;">
           <td colspan="4"></td>
-          <td><b><%= sprintf("%.2f", total_qty) rescue '-' %></b></td>
-          <td><b><%= sprintf("%.2f", total_price) rescue '-' %></b></td>
-          <td><b><%= sprintf("%.2f", total_amount) rescue '-' %></b></td>
+          <td><b><%= number_with_precision(total_qty, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
+          <td><b><%= number_with_precision(total_price, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
+          <td><b><%= number_with_precision(total_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-'%></b></td>
           <td></td>
         </tr>
         </tbody>
diff --git a/app/views/reports/credit_payment/index.html.erb b/app/views/reports/credit_payment/index.html.erb
index 7c520fe3..0619d976 100755
--- a/app/views/reports/credit_payment/index.html.erb
+++ b/app/views/reports/credit_payment/index.html.erb
@@ -23,6 +23,18 @@
 
 <div class="margin-top-20">
 	<div class="card ">
+	<% if @print_settings.precision.to_i > 0
+			    precision = @print_settings.precision
+		    else
+			    precision = 0
+		    end
+		     #check delimiter
+		    if @print_settings.delimiter
+			    delimiter = ","
+			else
+			    delimiter = ""
+			end
+			     %>	
 		<% unless @sale_data.blank? %>
 
 			<table class="table table-striped" border="0">
@@ -52,7 +64,7 @@
 						<td><%= credit.receipt_no rescue '-' %></td>
 						<td><%= credit.cashier_name rescue '-' %></td>
 						<td><%= credit.sale.customer.name rescue '-' %></td>
-						<td><%= credit.payment_amount rescue '-' %></td>
+						<td><%= number_with_precision(credit.payment_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 				  </tr>
 				<% end %>
 			  </tbody>
diff --git a/app/views/reports/dailysale/index.html.erb b/app/views/reports/dailysale/index.html.erb
index b8eded4f..76438060 100755
--- a/app/views/reports/dailysale/index.html.erb
+++ b/app/views/reports/dailysale/index.html.erb
@@ -44,6 +44,18 @@
 									<th style='text-align:center;'><%= t("views.right_panel.detail.grand_total") %></th>     	        
 								</tr>
 							</thead>
+							<% if @print_settings.precision.to_i > 0
+							      	 precision = @print_settings.precision
+								   else
+								   	precision = 0
+								   end
+								    #check delimiter
+								    if @print_settings.delimiter
+								        delimiter = ","
+								    else
+								        delimiter = ""
+								    end
+							    %>	
 							<% unless @sale_data.empty? %>
 
 							<tbody>
@@ -79,37 +91,37 @@
 								<tr>
 									<td style='text-align:right;'><%= count %></td>
 									<td><%= sale[:sale_date].strftime("#{sale[:sale_date].day.ordinalize} %b") rescue '-'  %></td>
-									<td style='color:red;text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:void_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>    
-									<td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",sale[:total_discount]), :delimiter => ',') rescue '-'%>)</td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total].to_f + sale[:rounding_adj].to_f ), :delimiter => ',') rescue '-'%></td>   
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:rounding_adj].to_f), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",sale[:grand_total]), :delimiter => ',') rescue '-'%></td>	   	
+									<td style='color:red;text-align:right;'><%= number_with_precision(sale[:void_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:mpu_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:master_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:visa_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:jcb_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:paypar_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision:precision, delimiter: delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:credit_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:foc_amount], precision:precision,delimiter:delimiter) rescue '-'%></td>    
+									<td style='text-align:right;'>(<%= number_with_precision(sale[:total_discount], precision:precision,delimiter:delimiter) rescue '-'%>)</td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total].to_f + sale[:rounding_adj].to_f , precision:precision,delimiter:delimiter) rescue '-'%></td>   
+									<td style='text-align:right;'><%= number_with_precision(sale[:rounding_adj].to_f, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(sale[:grand_total], precision:precision,delimiter:delimiter) rescue '-'%></td>	   	
 								</tr>
 								<% count = count + 1 %>
 								<% end %>
 
 								<tr style="font-weight:600;">
 									<td colspan="3" style='text-align:center;'>Total</td>	
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",mpu), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",master), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",visa), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",jcb), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",paypar), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",cash), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",credit), :delimiter => ',') rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",foc), :delimiter => ',') rescue '-'%></td>    
-									<td style='text-align:right;'>(<%= number_with_delimiter(sprintf("%.2f",discount), :delimiter => ',') rescue '-'%>)</td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",total), :delimiter => ',') rescue '-'%></td>    
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",rounding_adj), :delimiter => ',') rescue '-'%></td>   	
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",grand_total), :delimiter => ',') rescue '-'%></td>   
+									<td style='text-align:right;'><%= number_with_precision(mpu ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(master, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(visa, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(jcb, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(paypar, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(cash, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(credit, precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(foc, precision:precision,delimiter:delimiter) rescue '-'%></td>    
+									<td style='text-align:right;'>(<%= number_with_precision(discount, precision:precision,delimiter:delimiter) rescue '-'%>)</td>
+									<td style='text-align:right;'><%= number_with_precision(total, precision:precision,delimiter:delimiter) rescue '-'%></td>    
+									<td style='text-align:right;'><%= number_with_precision(rounding_adj, precision:precision,delimiter:delimiter) rescue '-'%></td>   	
+									<td style='text-align:right;'><%= number_with_precision(grand_total, precision:precision,delimiter:delimiter) rescue '-'%></td>   
 								</tr>
 
 								<% total_tax = 0 %>
@@ -118,7 +130,7 @@
 								<% total_tax += tax.tax_amount.to_f %>
 								<tr style="font-weight:600;">
 									<td colspan="12" style='text-align:right;'><%= tax.tax_name rescue '-'%></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",tax.tax_amount), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(tax.tax_amount, precision:precision,delimiter:delimiter) rescue '-'%></td>
 									<td colspan="2">&nbsp;</td>
 								</tr>
 
@@ -126,7 +138,7 @@
 								<% net = total - total_tax %>
 								<tr style="font-weight:600;">
 									<td colspan="12" style='text-align:right;'><%= t("views.right_panel.detail.net_amount") %></td>
-									<td style='text-align:right;'><%= number_with_delimiter(sprintf("%.2f",net), :delimiter => ',') rescue '-'%></td>
+									<td style='text-align:right;'><%= number_with_precision(net, precision:precision,delimiter:delimiter) rescue '-'%></td>
 									<td colspan="2">&nbsp;</td>	
 								</tr>
 								<% end %>
diff --git a/app/views/reports/payment_method/index.html.erb b/app/views/reports/payment_method/index.html.erb
index 0c48fe22..1fef1eab 100755
--- a/app/views/reports/payment_method/index.html.erb
+++ b/app/views/reports/payment_method/index.html.erb
@@ -50,18 +50,30 @@
 							<th><%= t("views.right_panel.detail.foc_sales") %></th>
 						</tr>
 					</thead>
+					<% if @print_settings.precision.to_i > 0
+					    precision = @print_settings.precision
+					    else
+						    precision = 0
+					    end
+					     #check delimiter
+					    if @print_settings.delimiter
+						    delimiter = ","
+						else
+						    delimiter = ""
+						end
+			    	 %>	
 					<% unless @sale_data.empty? %>
 						<tbody>
 							<% @sale_data.each do |sale| %>
 							<tr>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:mpu_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:master_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:visa_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:jcb_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:paypar_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:cash_amount]-sale[:total_change_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:credit_amount]), :delimiter => ',') rescue '-'%></td>
-								<td><%= number_with_delimiter(sprintf("%.2f",sale[:foc_amount]), :delimiter => ',') rescue '-'%></td>
+								<td><%= number_with_precision(sale[:mpu_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:master_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:visa_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:jcb_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:paypar_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:cash_amount]-sale[:total_change_amount], precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:credit_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+								<td><%= number_with_precision(sale[:foc_amount] , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 							</tr>
 							<% end %>
 							
@@ -108,11 +120,11 @@
 								<!--<td><%= payment.sale.customer.name rescue '-' %></td>-->
 								<td><%= payment.payment_method rescue '-' %></td>
 								<% if payment.payment_method === 'cash' %>
-								<td><%= payment.payment_amount - payment.change_amount%> </td>
+								<td><%= number_with_precision(payment.payment_amount - payment.change_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
 								<%else%>
-								<td><%= payment.payment_amount%> </td>
+								<td><%= number_with_precision(payment.payment_amount , precision: precision.to_i ,delimiter: delimiter) rescue '-' %> </td>
 								<%end%>
-								<td><%= payment.sale.grand_total rescue '-' %></td>
+								<td><%= number_with_precision(payment.sale.grand_total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 								
 							</tr>
 							
@@ -120,7 +132,7 @@
 						<%if total>0%>
 							<tr>
 							   <td colspan="4" style="text-align: right;"><strong >Total </strong></td>
-					    	 	<td colspan="2"><strong><%=total%></strong></td>
+					    	 	<td colspan="2"><strong><%=number_with_precision(total , precision: precision.to_i ,delimiter: delimiter) rescue '-' %></strong></td>
 						    </tr>
 					    <%end%>
 					</tbody>
diff --git a/app/views/reports/receipt_no/index.html.erb b/app/views/reports/receipt_no/index.html.erb
index e82c3e3c..9eee6ab9 100755
--- a/app/views/reports/receipt_no/index.html.erb
+++ b/app/views/reports/receipt_no/index.html.erb
@@ -58,6 +58,22 @@
 						</tr>
 					</thead>
 					<tbody>
+					<% if @print_settings.precision.to_i > 0
+								precision = @print_settings.precision
+							else
+								precision = 0
+							end
+							#check delimiter
+							if @print_settings.delimiter
+								delimiter = ","
+						    else
+								delimiter = ""
+						    end
+							
+							puts precision
+							puts "predelidm"
+							puts delimiter %>	
+
 						<% grand_total = 0 %>
 						<% old_grand_total = 0 %>
 						<% total_tax = 0 %>
@@ -81,31 +97,31 @@
 
 							<td><%= result.receipt_no rescue '-' %> </td>
 							<td><%= result.cashier_name rescue '-' %></td>
-							<td><%= result.total_amount rescue '-' %></td>
-							<td><%= result.total_discount rescue '-' %></td>
+							<td><%= number_with_precision(result.total_amount, precision: precision.to_i ,delimiter: delimiter) %></td>
+							<td><%= number_with_precision(result.total_discount, precision: precision.to_i ,delimiter: delimiter) %></td>
 							<%if result.customer.customer_type == "Takeaway"%>
-							    <td>0.0</td>
+							    <td><%= number_with_precision(0, precision: precision.to_i ,delimiter: delimiter) %></td>
 							<%end%>
 							<% result.sale_taxes.each do |tax| %>
-							<td><%= tax.tax_payable_amount rescue '-' %></td>
+							<td><%= number_with_precision(tax.tax_payable_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 							<%end%>
 
-							<td><%= result.grand_total %></td>			
-							<td><%= result.rounding_adjustment.to_f rescue '-' %></td>			
-							<td><%= result.grand_total_after_rounding()  rescue '-'%></td>
+							<td><%= number_with_precision(result.grand_total, precision: precision.to_i ,delimiter: delimiter) %></td>			
+							<td><%= number_with_precision(result.rounding_adjustment.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>			
+							<td><%= number_with_precision(result.grand_total_after_rounding(), precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 						</tr>
 
 						<% end %>
 						<tr style="border-top:4px double #666;">
 							<td colspan="2">&nbsp;</td>
-							<td><b><%= total_sum  rescue '-'%></b></td>
-							<td><b><%= discount_amt  rescue '-'%></b></td>
+							<td><b><%= number_with_precision(total_sum, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
+							<td><b><%= number_with_precision(discount_amt, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 							<% @sale_taxes.each do |tax| %>
-							<td><b><%= tax.st_amount.round(2) %></b></td>
+							<td><b><%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 							<% end %>
-							<td><b><%= grand_total.to_f.round(2)  rescue '-'%></b></td>		
-							<td><b><%= rounding_adj  rescue '-'%></b></td>		
-							<td><b><%= grand_total.to_f.round + rounding_adj %></b></td>				
+							<td><b><%= number_with_precision(grand_total.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>		
+							<td><b><%= number_with_precision(rounding_adj, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>		
+							<td><b><%= number_with_precision(grand_total.to_f.round + rounding_adj, precision: precision.to_i ,delimiter: delimiter)  %></b></td>				
 						</tr>
 						<tr>
 							<td colspan="2">&nbsp;</td>
diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index f780acdb..fbc518a6 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -45,6 +45,18 @@
 							</tr>	
 						</thead>
 						<tbody>
+							<% if @print_settings.precision.to_i > 0
+								precision = @print_settings.precision
+							else
+								precision = 0
+							end
+							#check delimiter
+							if @print_settings.delimiter
+								delimiter = ","
+						    else
+								delimiter = ""
+						    end
+							 %>	
 							<% unless @sale_data.blank? %>
 							<% acc_arr = Array.new %>
 							<% cate_arr = Array.new %>	 
@@ -86,7 +98,7 @@
 										<td>
 											<% @totalByAccount.each do |account, total| %>
 											<% if sale.account_id == account %>
-											<b><%= total %></b>
+											<b><%= number_with_precision(total, precision:precision,delimiter:delimiter) %></b>
 											<% grand_total += total %>	  
 											<% end %>
 											<% end %>
@@ -105,8 +117,8 @@
 									<td><%= sale.item_code rescue '-' %></td>
 									<td><%= sale.product_name rescue '-' %></td>
 									<td><%= sale.total_item rescue '-' %></td>
-									<td><%= sale.unit_price rescue '-' %></td>
-									<td><%= sale.grand_total rescue '-' %></td>
+									<td><%= number_with_precision(sale.unit_price ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
+									<td><%= number_with_precision(sale.grand_total ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
 								</tr>
 								<!-- sub total -->
 
@@ -121,7 +133,7 @@
 											<td><b>Total <%= sale.account_name %> Qty </b> </td>
 											<td><b><%= sub_qty %></b></td>
 											<td><%= t("views.right_panel.detail.sub_total") %></td>
-											<td ><span class="underline"><%= sub_total %></span></td>
+											<td ><span class="underline"><%=  number_with_precision(sub_total ,  precision:precision,delimiter:delimiter)%> </span></td>
 										</tr>
 										<% sub_total = 0.0%>
 										<% sub_qty = 0 %>
@@ -149,8 +161,8 @@
 										<td><%= other.item_code rescue '-' %></td>
 										<td><%= other.product_name rescue '-' %></td>
 										<td><%= other.total_item rescue '-' %></td>
-										<td><%= other.unit_price rescue '-' %></td>
-										<td><%= other.grand_total rescue '-' %></td>
+										<td> <%= number_with_precision(other.unit_price ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
+										<td> <%= number_with_precision(other.grand_total ,  precision:precision,delimiter:delimiter) rescue '-'%></td>
 									</tr>
 									<!-- sub total -->
 									
@@ -160,7 +172,7 @@
 								<tr>
 									<td colspan="5">&nbsp;</td>
 									<td><%= t("views.right_panel.detail.sub_total") %></td>
-									<td ><span><%= other_sub_total %></span></td>
+									<td ><span><%=  number_with_precision(other_sub_total ,  precision:precision,delimiter:delimiter)%></span></td>
 								</tr>
 						    <%end%>
 							<!-- End Other Charges -->
@@ -169,29 +181,29 @@
 								<td><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.item") %></td>
 								<td><span><%= total_qty%></span></td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.total") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= grand_total%></span></td> 
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(grand_total ,  precision:precision,delimiter:delimiter)%></span></td> 
 							</tr>
 							<% end %>
 
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.foc_item") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td><span><%= total_item_foc %></span></td>
+								<td><span><%= number_with_precision(total_item_foc ,  precision:precision,delimiter:delimiter) %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.item_discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= total_item_dis %></span></td>
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(total_item_dis ,  precision:precision,delimiter:delimiter) %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td><%= t("views.right_panel.detail.foc_sales") %></td>
-								<td><span><%= @foc_data %></span></td>
+								<td><span><%= number_with_precision(@foc_data ,  precision:precision,delimiter:delimiter) %></span></td>
 							</tr>
 							<tr>
 								<td colspan="5">&nbsp;</td>
 								<td style="border-bottom:2px solid grey;"><%= t("views.right_panel.detail.discount") %> <%= t("views.right_panel.detail.amount") %></td>
-								<td style="border-bottom:2px solid grey;"><span><%= @discount_data %></span></td>
+								<td style="border-bottom:2px solid grey;"><span><%= number_with_precision(@discount_data ,  precision:precision,delimiter:delimiter) %></span></td>
 							</tr>	
 							
 								<% @sale_taxes.each do |tax| %>
@@ -207,7 +219,7 @@
 								<td colspan="5">&nbsp;</td>
 								<td style="border-top:2px solid grey;">Net Amount</td>
 								<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
-								<td style="border-top:2px solid grey;"><%= grand_total.to_f - @discount_data.to_f%></td> 
+								<td style="border-top:2px solid grey;"><%= number_with_precision(grand_total.to_f - @discount_data.to_f ,  precision:precision,delimiter:delimiter)%></td> 
 							</tr>
 							<!-- <tr>
 								<td colspan="5">&nbsp;</td>
diff --git a/app/views/reports/shiftsale/index.html.erb b/app/views/reports/shiftsale/index.html.erb
index 8138007d..9553e733 100755
--- a/app/views/reports/shiftsale/index.html.erb
+++ b/app/views/reports/shiftsale/index.html.erb
@@ -63,6 +63,18 @@
 				</tr>
 			</thead>
 			<tbody>
+			<% if @print_settings.precision.to_i > 0
+			    precision = @print_settings.precision
+		    else
+			    precision = 0
+		    end
+		     #check delimiter
+		    if @print_settings.delimiter
+			    delimiter = ","
+			else
+			    delimiter = ""
+			end
+			     %>	
 				<% void = 0%>	  
 				<% cash = 0%>	  
 				<% credit = 0%>	  
@@ -86,16 +98,16 @@
 							<%= result[:shift_closed_at].strftime("%e %b %I:%M%p") rescue '-'  %>
 						</td>
 						<!-- <td style='color:red;'>(<%= sprintf "%.2f",result.void_amount.to_f.to_d  rescue '-'%>)</td> -->
-						<td><%= sprintf "%.2f",result[:cash_sales].to_f.to_d  rescue '-'%></td>
-						<td><%= sprintf "%.2f",result[:credit_sales].to_f.to_d  rescue '-'%></td>
+						<td><%= number_with_precision(result[:cash_sales].to_f,  precision:precision,delimiter:delimiter) %></td>
+						<td><%= number_with_precision(result[:credit_sales].to_f,  precision:precision,delimiter:delimiter) rescue '-'%></td>
 						<!-- <td><%= sprintf "%.2f",result.accept_credit_amount.to_f.to_d  rescue '-'%></td> -->
 						<!-- <td><%= sprintf "%.2f",result.foc_amount.to_f.to_d  rescue '-'%></td>
 						<td><%= sprintf "%.2f",result.card_amount.to_f.to_d  rescue '-'%></td> -->	
-						<td><%= sprintf "%.2f",result[:other_sales].to_f.to_d  rescue '-'%></td>	  		  
+						<td><%= number_with_precision(result[:other_sales].to_f,  precision:precision,delimiter:delimiter) rescue '-'%></td>	  		  
 						<td>
-						 	<%= sprintf "%.2f",result[:foc_sales].to_f.to_d  rescue '-'%>
+						 	<%= number_with_precision(result[:foc_sales].to_f,  precision:precision,delimiter:delimiter) rescue '-'%>
 						</td>	  		  
-						<td><%= sprintf "%.2f",result[:grand_total].to_f.to_d  rescue '-'%></td>	
+						<td><%= number_with_precision(result[:grand_total].to_f,  precision:precision,delimiter:delimiter) rescue '-'%></td>	
 
 						<!--  <td><%= sprintf "%.2f",result[:rounding_adj].to_f.to_d  rescue '-'%></td>	 -->
 						<% grand_total = result[:grand_total].to_f %>	  
@@ -114,15 +126,15 @@
 					<tr style="border-top: 3px solid grey;">
 						<td colspan="3"></td>
 						<!-- <td style='color:red;'><b>(<%= sprintf("%.2f",void)  rescue '-'%>)</b></td> -->
-						<td><b><%= sprintf("%.2f",cash)  rescue '-'%></b></td>
-						<td><b><%= sprintf("%.2f",credit)  rescue '-'%></b></td>
+						<td><b><%= number_with_precision(cash,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_with_precision(credit,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",accept_credit)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td> -->
-						<td><b><%= sprintf("%.2f",card)  rescue '-'%></b></td>
-						<td><b><%= sprintf("%.2f",foc)  rescue '-'%></b></td>
+						<td><b><%= number_with_precision(card,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
+						<td><b><%= number_with_precision(foc,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>
 						<!-- <td><b><%= sprintf("%.2f",total)  rescue '-'%></b></td> -->
 						<!-- <td><b><%= sprintf("%.2f",rounding_adj)  rescue '-'%></b></td> -->	
-						<td><b><%= sprintf("%.2f",g_total)  rescue '-'%></b></td>	 			
+						<td><b><%= number_with_precision(g_total,  precision:precision,delimiter:delimiter) rescue '-'%></b></td>	 			
 					</tr>
 				</tbody>
 			</table>
diff --git a/app/views/reports/void_sale/index.html.erb b/app/views/reports/void_sale/index.html.erb
index 045df74d..d7b6ee10 100755
--- a/app/views/reports/void_sale/index.html.erb
+++ b/app/views/reports/void_sale/index.html.erb
@@ -52,6 +52,18 @@
 						</tr>
 					</thead>
 					<tbody>
+					<% if @print_settings.precision.to_i > 0
+					    precision = @print_settings.precision
+					    else
+						    precision = 0
+					    end
+					     #check delimiter
+					    if @print_settings.delimiter
+						    delimiter = ","
+						else
+						    delimiter = ""
+						end
+			    	 %>	
 						<% total_amount = 0.0 %>
 						<% grand_total = 0.0 %>
 						<% rounding_adjustment = 0.0 %>
@@ -61,10 +73,10 @@
 						<tr>
 							<td><%= item.receipt_no rescue '-' %> </td>
 							<td><%= item.receipt_date.utc.getlocal.strftime("%e %b %I:%M%p") rescue '-' %></td>
-							<td><%= item.total_amount.to_f  rescue '-'%> </td>
-							<td><%= item.grand_total.to_f  rescue '-'%> </td>
-							<td><%= item.rounding_adjustment.to_f rescue '-' %></td>
-							<td><%= item.grand_total.to_f + item.rounding_adjustment.to_f  rescue '-'%> </td>								
+							<td><%= number_with_precision(item.total_amount.to_f, precision: precision.to_i ,delimiter: delimiter) %> </td>
+							<td><%= number_with_precision(item.grand_total.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%> </td>
+							<td><%= number_with_precision(item.rounding_adjustment.to_f, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_with_precision(item.grand_total.to_f + item.rounding_adjustment.to_f , precision: precision.to_i ,delimiter: delimiter) rescue '-'%> </td>								
 							<!-- <td><%= result.sales_status rescue '-' %> </td> -->
 							<!-- <td><%= item.remarks rescue '-' %> </td> -->
 						</tr>
@@ -76,10 +88,10 @@
 						<% end %>
 						<tr style="border-top:4px double #666;font-weight:600;">
 							<td colspan="2" style="text-align:center;">Total Void Amount :</td>
-							<td><%= total_amount rescue '-' %></td>
-							<td><%= grand_total rescue '-' %></td>
-							<td><%= rounding_adjustment  rescue '-'%></td>
-							<td colspan="3"><%= grand_rounding_adjustment  rescue '-'%></td>
+							<td><%= number_with_precision(total_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_with_precision(grand_total, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
+							<td><%= number_with_precision(rounding_adjustment, precision: precision.to_i ,delimiter: delimiter)  rescue '-'%></td>
+							<td colspan="3"><%= number_with_precision(grand_rounding_adjustment, precision: precision.to_i ,delimiter: delimiter)  rescue '-'%></td>
 						</tr>
 					</tbody>
 				</table>

From e55be61a5977e1d7f9a1f40ecd285d49a3c0a69b Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Mon, 8 Jan 2018 17:33:27 +0630
Subject: [PATCH 79/84] first bill for manager role

---
 app/models/ability.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/ability.rb b/app/models/ability.rb
index 4470fb4b..02b2618f 100755
--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -58,6 +58,7 @@ class Ability
         can :create, :discount
         can :remove_discount_items, :discount
         can :remove_all_discount, :discount
+        can :member_discount, :discount
 
         can :first_bill, :payment
         can :show, :payment

From 534b0659a97ee9937d1900fdbd60666b6a7fe3d6 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 8 Jan 2018 18:10:22 +0630
Subject: [PATCH 80/84] print bill for a5

---
 app/pdf/receipt_bill_a5_pdf.rb | 507 +++++++++++++++++++++++++++++++++
 1 file changed, 507 insertions(+)
 create mode 100644 app/pdf/receipt_bill_a5_pdf.rb

diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
new file mode 100644
index 00000000..4346759c
--- /dev/null
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -0,0 +1,507 @@
+class ReceiptBillA5Pdf < Prawn::Document
+  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, :description_width, :price_num_width
+  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)
+    self.page_width = printer_settings.page_width
+    self.page_height = printer_settings.page_height
+    self.margin = 20
+    self.price_width = 120
+    self.qty_width = 50
+    self.total_width = 120
+    self.item_width = self.page_width - ((self.qty_width + self.price_width + self.total_width))
+    self.item_height = 25
+    self.item_description_width = (self.page_width-20) / 2
+    self.label_width = 150
+
+    self.description_width = 500
+    self.price_num_width = 100
+    # @item_width = self.page_width.to_i / 2
+    # @qty_width = @item_width.to_i / 3
+    # @double = @qty_width * 1.3
+    # @half_qty = @qty_width / 2
+    #setting page margin and width
+    super(:margin => [printer_settings.heading_space, self.margin, self.margin, self.margin], :page_size => [self.page_width, self.page_height])
+
+    #precision checked
+    if printer_settings.precision.to_i > 2
+        printer_settings.precision = 2
+    end
+
+    # db font setup
+    if printer_settings.font != ""
+        font_families.update("#{printer_settings.font}" => {
+            :normal => "public/fonts/#{printer_settings.font}.ttf",
+            :italic => "public/fonts/#{printer_settings.font}.ttf",
+            :bold => "public/fonts/#{printer_settings.font}.ttf",
+            :bold_italic => "public/fonts/#{printer_settings.font}.ttf"
+        })
+
+        font "#{printer_settings.font}"
+        fallback_fonts ["Courier", "Helvetica", "Times-Roman"]
+    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 = ","
+    else
+        delimiter = ""
+    end
+
+    header(shop_details)
+
+    stroke_horizontal_rule
+
+    cashier_info(sale_data, customer_name)
+    line_items(sale_items,printer_settings.precision,delimiter)
+    all_total(sale_data,printer_settings.precision,delimiter)
+
+
+    if member_info != nil
+        member_info(member_info,customer_name,rebate_amount,sale_data,printer_settings.precision,delimiter,current_balance)
+    end
+
+    customer(customer_name)
+
+    if discount_price_by_accounts.length > 0 && shop_details.show_account_info
+        discount_account(discount_price_by_accounts,printer_settings.precision,delimiter)
+    end
+
+    if shop_details.show_account_info
+       items_account(item_price_by_accounts,printer_settings.precision,delimiter)
+    end
+
+    sign(sale_data)
+
+    footer(printed_status)
+  end
+
+  def header (shop_details)
+    move_down 10
+    text "#{shop_details.name}", :size => self.header_font_size,:align => :center
+    move_down 10
+    text "#{shop_details.address}", :size => self.item_font_size,:align => :center
+    # move_down self.item_height
+    move_down 10
+    text "#{shop_details.phone_no}", :size => self.item_font_size,:align => :center
+    move_down 10
+
+    stroke_horizontal_rule
+  end
+
+  def cashier_info(sale_data, customer_name)
+        move_down 12
+        # move_down 2
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.item_description_width, :height => self.item_height) do
+            text "Receipt No: #{sale_data.receipt_no}", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.item_description_width, y_position], :width => self.item_description_width, :height => self.item_height) do
+            text "#{ sale_data.bookings[0].dining_facility.type } - #{ sale_data.bookings[0].dining_facility.name }" , :size => self.item_font_size,:align => :right
+        end
+        move_down 10
+
+        y_position = cursor
+        bounding_box([0, y_position], :width =>self.item_description_width, :height => self.item_height) do
+            text "W: #{sale_data.requested_by}" , :size => self.item_font_size, :align => :left
+        end    
+        bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
+              text "C: #{sale_data.cashier_name}", :size => self.item_font_size,:align => :right
+        end
+        move_down 10
+
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.page_width - 20, :height => self.item_height) do
+                text "Date : #{ sale_data.receipt_date.strftime('%d-%m-%Y') } ( #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } - #{ sale_data.bookings[0].checkout_at.utc.getlocal.strftime('%I:%M %p') } )",:size => self.item_font_size,:align => :left
+        end
+
+
+        # bounding_box([self.item_description_width,y_position], :width =>self.label_width+5) do
+        #      text "(#{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') } 
+        #         - #{ sale_data.bookings[0].checkin_at.utc.getlocal.strftime('%I:%M %p') })" ,
+        #          :size => self.item_font_size,:align => :right
+        # end
+
+        move_down 10
+        stroke_horizontal_rule
+  end
+
+    def line_items(sale_items,precision,delimiter)
+        if precision.to_i > 0
+            item_label_qty_front_width = (self.item_width+self.price_width) + 5
+            item_label_qty_end_width = self.qty_width + 4
+            item_label_total_front_width = (self.item_width+self.price_width) + 10
+            item_label_total_end_width = self.total_width + 9
+        else
+            self.item_width = self.item_width.to_i + 8
+            item_label_qty_front_width = (self.item_width+self.price_width) + 8
+            item_label_qty_end_width = self.qty_width + 7
+            item_label_total_front_width = (self.item_width+self.price_width) + 5
+            item_label_total_end_width = self.total_width + 4
+        end
+        move_down 10
+        y_position = cursor
+        move_down 10
+        pad_top(15) {
+            # @item_width.to_i + @half_qty.to_i
+            text_box "Items", :at =>[0,y_position], :width => self.item_width, :height =>self.item_height, :size => self.item_font_size, :overflow => :shrink_to_fix
+            text_box "Price", :at =>[(self.item_width),y_position], :width => self.price_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+            text_box "Qty", :at =>[item_label_qty_front_width,y_position], :width => item_label_qty_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix
+            text_box "Total", :at =>[item_label_total_front_width,y_position], :width => item_label_total_end_width, :height =>self.item_height, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix
+        }
+        move_down -5
+        stroke_horizontal_rule
+        add_line_item_row(sale_items,precision,delimiter)
+    end
+
+    def add_line_item_row(sale_items,precision,delimiter)
+        if precision.to_i > 0
+            item_name_width = (self.item_width+self.price_width)
+            item_qty_front_width = (self.item_width+self.price_width) + 5
+            item_qty_end_width = self.qty_width + 4
+            item_total_front_width = item_name_width + 10
+            item_total_end_width = self.total_width + 9
+        else
+            item_name_width = (self.item_width+self.price_width)
+            item_qty_front_width = item_name_width + 8
+            item_qty_end_width = self.qty_width + 7
+            item_total_front_width = item_name_width + 5
+            item_total_end_width = self.total_width + 4
+        end
+        y_position = cursor
+        move_down 10
+        sub_total = 0.0
+        sale_items.each do |item|
+            # check for item not to show 
+          if item.price != 0
+                sub_total    += item.price  #(item.qty*item.unit_price) - comment for room charges
+                qty           = item.qty
+                total_price   = item.price #item.qty*item.unit_price - comment for room charges
+                price         = item.unit_price
+                product_name  = item.product_name
+
+
+                y_position = cursor
+
+                pad_top(15) {
+                  bounding_box([0,y_position], :width =>self.item_width) do
+                    text "#{product_name}", :size => self.item_font_size,:align => :left
+                  end
+                   # text_box "#{product_name}", :at =>[0,y_position], :width => self.item_width, :size => self.item_font_size                
+                   text_box "#{number_with_precision(price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[self.item_width,y_position], :width => self.price_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
+                   text_box "#{number_with_precision(qty, :precision => precision.to_i)}", :at =>[item_qty_front_width,y_position], :width => item_qty_end_width,  :size => self.item_font_size, :align => :center, :overflow => :shrink_to_fix                  
+                   text_box  "#{number_with_precision(total_price, :precision => precision.to_i, :delimiter => delimiter)}", :at =>[item_total_front_width,y_position], :width =>item_total_end_width, :size => self.item_font_size, :align => :right, :overflow => :shrink_to_fix                  
+                }
+                move_down 10
+            end
+        end
+
+        stroke_horizontal_rule
+
+        move_down 10
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+            text "Sub Total", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+            text "#{number_with_precision(sub_total, :precision => precision.to_i, :delimiter => delimiter)}" ,:delimiter => ',', :size => self.item_font_size,:align => :right
+         end  
+        move_down 10      
+    end
+
+    def all_total(sale_data,precision,delimiter)
+        item_name_width = self.item_width
+        y_position = cursor
+        if sale_data.discount_type == 'member_discount'
+            dis_type = "Member Discount:"
+        else
+            dis_type = "Overall Discount:"
+        end
+
+        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+            text "#{ dis_type }", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+            text "( #{number_with_precision(sale_data.total_discount, :precision => precision.to_i, :delimiter => delimiter)} )" , :size => self.item_font_size,:align => :right
+        end
+
+        if sale_data.sale_taxes.length > 0
+            sale_data.sale_taxes.each do |st|
+                move_down 10
+                y_position = cursor
+
+                bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                    text "#{ st.tax_name } ( #{ st.tax_rate.to_i }%)", :size => self.item_font_size,:align => :left
+                end
+                bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                    text  "#{number_with_precision(st.tax_payable_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+                end
+            end
+        else
+
+        end
+
+        # move_down 10
+        # y_position = cursor
+
+        # bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+        #     text "Total Tax", :size => self.item_font_size,:align => :left
+        # end
+        # bounding_box([self.description_width,y_position], :width =>self.label_width) do
+        #     text  "( " +"#{sale_data.total_tax}" +" )" , :size => self.item_font_size,:align => :right
+        # end
+
+        if sale_data.rounding_adjustment != 0.0
+                move_down 10
+            y_position = cursor
+
+            bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                text "Rounding Adjustment", :size => self.item_font_size,:align => :left
+            end
+            bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                text "#{sale_data.rounding_adjustment}", :size => self.item_font_size,:align => :right
+            end 
+        end
+
+        move_down 10
+        y_position = cursor
+        move_down 10
+        bounding_box([0,y_position], :width =>self.description_width) do
+             text "Grand Total",:style => :bold, :size => self.header_font_size,:align => :left
+        end
+        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+            text "#{number_with_precision(sale_data.grand_total, :precision => precision.to_i, :delimiter => delimiter)}" , :style => :bold, :size => self.header_font_size,:align => :right
+        end
+        move_down 10
+        
+        sale_payment(sale_data,precision,delimiter)
+       
+    end
+
+    def sale_payment(sale_data,precision,delimiter)        
+        stroke_horizontal_rule
+        move_down 10
+        sale_payments = SalePayment.select("SUM(sale_payments.payment_amount) as payment_amount,sale_payments.payment_method").where('sale_id = ?', sale_data.sale_id).group("payment_method")
+        sale_payments.each do |payment|
+            y_position = cursor
+            if payment.payment_method == "paypar"
+                bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                text "Redeem Payment", :size => self.item_font_size,:align => :left
+            end
+            else
+                bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                text "#{payment.payment_method.capitalize} Payment", :size => self.item_font_size,:align => :left
+            end
+            end
+            
+            bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                text "#{number_with_precision(payment.payment_amount, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+            end
+            move_down 10
+        end
+        if sale_data.amount_received > 0   
+            y_position = cursor
+            move_down 10
+            bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                 text "Change Amount", :size => self.item_font_size,:align => :left
+            end
+            bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                text "#{number_with_precision(sale_data.amount_changed, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+            end
+            move_down 10
+        end        
+    end
+
+    # show member information
+    def member_info(member_info,customer_name,rebate_amount,sale_data,precision,delimiter,current_balance)
+        if rebate_amount != nil        
+            if rebate_amount["status"] == true
+                stroke_horizontal_rule
+                total = 0
+                balance = 0
+                rebate_balance =0
+                redeem = 0
+                redeem_count = 0
+                rebate_amount["data"].each do |res|
+                    total = total + res["balance"]
+                #total redeem amount
+                    if res["receipt_no"]== sale_data.receipt_no && res["status"]== "Redeem"
+                        redeem = redeem + res["withdraw"]
+                        balance = balance + res["balance"]
+                    end
+                #end Total redem
+                #total Rebate Earn
+                    if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebateAccount" && res["status"]== "Rebate"
+
+                         rebate_balance = rebate_balance + res["deposit"]
+
+                        move_down 10
+                        y_position = cursor
+                        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                            text "Rebate Earn", :size => self.item_font_size,:align => :left
+                        end
+                        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                            text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                        end
+                        
+                    end 
+                # Total Rebate Amount if birthday
+                    if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebatebonusAccount" && res["status"]== "Rebate"
+                         rebate_balance = rebate_balance + res["deposit"]
+                        move_down 10
+                        y_position = cursor
+                        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                            text "Rebate Earn Bonus", :size => self.item_font_size,:align => :left
+                        end
+                        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                            text "#{number_with_precision(res["deposit"], :precision => precision.to_i, :delimiter => delimiter)}"  , :size => self.item_font_size,:align => :right
+                        end
+                    end  
+                #end Total rebate if birthday
+                end
+
+                 move_down 10
+                    y_position = cursor
+                  bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                     text "Redeem Amount", :size => self.item_font_size,:align => :left
+                  end
+                  bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                    text "#{number_with_precision(redeem, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                  end
+
+                 if current_balance != nil
+                     move_down 10
+                    y_position = cursor
+                     bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                         text "Old Balance", :size => self.item_font_size,:align => :left
+                     end
+                      bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                        text "#{number_with_precision(current_balance, :precision => precision.to_i, :delimiter => delimiter)}", :size => self.item_font_size,:align => :right
+                     end
+                 end
+                
+            end
+        end
+
+        if member_info["status"] == true && member_info["data"].present?
+            total_balance = 0
+            member_info["data"].each do |res|
+
+                if res["accountable_type"] == "RebateAccount" || res["accountable_type"] == "RebatebonusAccount"
+                    total_balance = total_balance + res["balance"]
+                    
+                end
+            end
+            move_down 10
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                 text "Total Balance", :size => self.item_font_size,:align => :left
+            end
+             bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                  text "#{number_with_precision(total_balance, :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+              end
+        end
+       
+    end
+
+    def customer(customer_name)
+        move_down 10
+        y_position = cursor
+        bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                text "Customer Name", :size => self.item_font_size,:align => :left
+        end
+        bounding_box([self.description_width,y_position], :width =>self.label_width) do
+             text "#{ customer_name }" , :size => self.item_font_size,:align => :right
+        end
+    end
+
+
+    def discount_account(discount_price_by_accounts,precision,delimiter)
+        move_down 10
+        stroke_horizontal_rule
+        move_down 10
+        y_position = cursor
+        discount_price_by_accounts.each do |ipa|
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.description_width, :height => self.item_height) do
+                text "#{ 'Total ' + ipa[:name] + ' Discounts' }", :size => self.item_font_size,:align => :left
+            end
+            bounding_box([self.description_width,y_position], :width =>self.label_width) do
+                text "(" + "#{ number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter) }" + ")" , :size => self.item_font_size,:align => :right
+            end  
+        end
+    end
+
+    def items_account(item_price_by_accounts,precision,delimiter)
+        move_down 10
+        stroke_horizontal_rule
+        move_down 10
+        y_position = cursor
+        item_price_by_accounts.each do |ipa|
+            y_position = cursor
+            bounding_box([0,y_position], :width =>self.label_width) do
+                text "#{ ipa[:name] }", :size => self.item_font_size,:align => :left
+            end
+            bounding_box([self.label_width,y_position], :width =>self.description_width) do
+                text "#{number_with_precision(ipa[:price], :precision => precision.to_i, :delimiter => delimiter)}" , :size => self.item_font_size,:align => :right
+            end  
+        end
+    end
+
+    def sign(sale_data)
+        SalePayment.where('sale_id = ?', sale_data.sale_id).each do |payment|        
+            if payment.payment_method == "creditnote"
+
+                y_position = cursor
+                stroke_horizontal_rule
+                
+                bounding_box([self.label_width,y_position], :width =>self.description_width) do
+                   move_down 70
+                   stroke_horizontal_rule
+                end
+                
+                bounding_box([self.label_width,y_position], :width =>self.description_width) do
+                   move_down 73
+                   text "Approved By" , :size => self.item_font_size,:align => :center
+                end
+                break;
+            end
+        end
+        if sale_data.payment_status == "foc"
+
+            y_position = cursor
+            stroke_horizontal_rule
+
+            bounding_box([self.label_width,y_position], :width =>self.description_width) do
+                 move_down 70
+                 stroke_horizontal_rule
+             end
+             
+             bounding_box([self.label_width,y_position], :width =>self.description_width) do
+                 move_down 73
+                 text "Acknowledged By" , :size => self.item_font_size,:align => :center
+             end
+        end
+        
+        
+    end
+
+    def footer(printed_status)
+        move_down 10
+        stroke_horizontal_rule
+        move_down 10
+
+        y_position = cursor
+        bounding_box([0, y_position], :width =>self.label_width) do
+            text "#{printed_status}",:style => :bold, :size => header_font_size,:align => :left
+        end    
+        bounding_box([self.description_width,y_position], :width =>self.description_width, :height => self.item_height) do
+            text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :left
+        end        
+
+        move_down 10
+    end
+end
+

From 8e19b26fbcc695f681bf29972126a343c52a3aba Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 9 Jan 2018 10:29:45 +0630
Subject: [PATCH 81/84] update sale item qty sum

---
 app/views/reports/saleitem/index.html.erb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/views/reports/saleitem/index.html.erb b/app/views/reports/saleitem/index.html.erb
index fbc518a6..4ad30d82 100644
--- a/app/views/reports/saleitem/index.html.erb
+++ b/app/views/reports/saleitem/index.html.erb
@@ -83,12 +83,12 @@
 								end %>
 
 								<% if sale.status_type == "foc" && sale.grand_total < 0
-											total_item_foc += sale.grand_total*(-1)
-										end %>	 
+									total_item_foc += sale.grand_total*(-1)
+								end %>	 
 
-										<% if sale.status_type == "Discount" &&  sale.grand_total < 0
-											total_item_dis += sale.grand_total*(-1)
-										end %>
+								<% if sale.status_type == "Discount" &&  sale.grand_total < 0
+									total_item_dis += sale.grand_total*(-1)
+								end %>
 
 								<% if !acc_arr.include?(sale.account_id) %>
 									<tr>
@@ -126,7 +126,10 @@
 								<% if sale.account_id == key %>
 								    <% count = count + 1 %>	
 								    <% sub_total += sale.grand_total %>
-								    <% sub_qty += sale.total_item %>
+								    <% #sub_qty += sale.total_item %>
+								    <% if sale.status_type != "Discount" && sale.status_type != "foc"
+										sub_qty += sale.total_item
+									end %>
 									<% if count == value %>	
 										<tr>
 											<td colspan="3">&nbsp;</td>

From 66304cfccf9d2bff66b63ed2cbfcb74042f9ce18 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 9 Jan 2018 11:36:36 +0630
Subject: [PATCH 82/84] cups update

---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 0fb5f323..90182812 100755
--- a/Gemfile
+++ b/Gemfile
@@ -43,7 +43,7 @@ gem 'carrierwave', '~> 1.0'
 gem 'mini_magick'
 
 #Report and Printing gems
-gem 'cups', '~> 0.0.7'
+gem 'cups'
 gem 'prawn'
 gem 'prawn-table'
 gem 'spreadsheet'
diff --git a/Gemfile.lock b/Gemfile.lock
index 05be67ea..48c34ea2 100755
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -81,7 +81,7 @@ GEM
     concurrent-ruby (1.0.5)
     connection_pool (2.2.1)
     crass (1.0.2)
-    cups (0.0.7)
+    cups (0.1.10)
     database_cleaner (1.6.2)
     diff-lcs (1.3)
     erubi (1.7.0)
@@ -294,7 +294,7 @@ DEPENDENCIES
   carrierwave (~> 1.0)
   chartkick
   coffee-rails (~> 4.2)
-  cups (~> 0.0.7)
+  cups
   database_cleaner
   factory_girl_rails (~> 4.0)
   faker

From be6dd25a7012a37f193f33ad3d0a2fc54d8819f8 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 9 Jan 2018 15:58:37 +0630
Subject: [PATCH 83/84] a5 print format done

---
 app/controllers/origami/payments_controller.rb |  8 ++++----
 app/models/printer/receipt_printer.rb          |  2 +-
 app/pdf/receipt_bill_a5_pdf.rb                 | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index 0bc77fc3..b14be800 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -22,7 +22,7 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
     # Print for First Bill to Customer
-    unique_code = "ReceiptBillPdf"
+    unique_code = "ReceiptBillA5Pdf"
      #shop detail
     shop_details =  Shop::ShopDetail 
     # customer= Customer.where('customer_id=' +.customer_id)
@@ -106,7 +106,7 @@ class Origami::PaymentsController < BaseOrigamiController
       cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
       # For Print
-      unique_code = "ReceiptBillPdf"
+      unique_code = "ReceiptBillA5Pdf"
       customer= Customer.find(saleObj.customer_id)
        
       # get member information
@@ -228,7 +228,7 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
-    unique_code = "ReceiptBillPdf"
+    unique_code = "ReceiptBillA5Pdf"
     customer= Customer.find(saleObj.customer_id)
 
     #shop detail
@@ -285,7 +285,7 @@ class Origami::PaymentsController < BaseOrigamiController
       # Re-call Sale Data
       saleObj      = Sale.find(sale_id)
 
-      unique_code = "ReceiptBillPdf"
+      unique_code = "ReceiptBillA5Pdf"
       customer= Customer.find(saleObj.customer_id)
       
        #shop detail
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index adcb187e..7a1ef65a 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -70,7 +70,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Generate PDF
     #Print
 
-    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance)
+    pdf = ReceiptBillA5Pdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance)
 
     # print as print copies in printer setting
     count = printer_settings.print_copies
diff --git a/app/pdf/receipt_bill_a5_pdf.rb b/app/pdf/receipt_bill_a5_pdf.rb
index 4346759c..0861c65a 100644
--- a/app/pdf/receipt_bill_a5_pdf.rb
+++ b/app/pdf/receipt_bill_a5_pdf.rb
@@ -4,13 +4,13 @@ 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)
     self.page_width = printer_settings.page_width
     self.page_height = printer_settings.page_height
-    self.margin = 20
+    self.margin = 15
     self.price_width = 120
     self.qty_width = 50
     self.total_width = 120
     self.item_width = self.page_width - ((self.qty_width + self.price_width + self.total_width))
     self.item_height = 25
-    self.item_description_width = (self.page_width-20) / 2
+    self.item_description_width = (self.page_width-40) / 2
     self.label_width = 150
 
     self.description_width = 500
@@ -494,11 +494,11 @@ class ReceiptBillA5Pdf < Prawn::Document
         move_down 10
 
         y_position = cursor
-        bounding_box([0, y_position], :width =>self.label_width) do
+        bounding_box([0, y_position], :width =>self.item_description_width) do
             text "#{printed_status}",:style => :bold, :size => header_font_size,:align => :left
         end    
-        bounding_box([self.description_width,y_position], :width =>self.description_width, :height => self.item_height) do
-            text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :left
+        bounding_box([self.item_description_width,y_position], :width =>self.item_description_width, :height => self.item_height) do
+            text "Thank You! See you Again", :left_margin => -5, :size => self.item_font_size,:align => :right
         end        
 
         move_down 10

From afd893d8319f56e18206ab93fa71a20edc708619 Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Tue, 9 Jan 2018 16:33:10 +0630
Subject: [PATCH 84/84] remove a5

---
 app/controllers/origami/payments_controller.rb | 8 ++++----
 app/models/printer/receipt_printer.rb          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index b14be800..0bc77fc3 100755
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -22,7 +22,7 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
     # Print for First Bill to Customer
-    unique_code = "ReceiptBillA5Pdf"
+    unique_code = "ReceiptBillPdf"
      #shop detail
     shop_details =  Shop::ShopDetail 
     # customer= Customer.where('customer_id=' +.customer_id)
@@ -106,7 +106,7 @@ class Origami::PaymentsController < BaseOrigamiController
       cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
       # For Print
-      unique_code = "ReceiptBillA5Pdf"
+      unique_code = "ReceiptBillPdf"
       customer= Customer.find(saleObj.customer_id)
        
       # get member information
@@ -228,7 +228,7 @@ class Origami::PaymentsController < BaseOrigamiController
     cashier_zone = CashierTerminalByZone.find_by_zone_id(table.zone_id)
     cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)
 
-    unique_code = "ReceiptBillA5Pdf"
+    unique_code = "ReceiptBillPdf"
     customer= Customer.find(saleObj.customer_id)
 
     #shop detail
@@ -285,7 +285,7 @@ class Origami::PaymentsController < BaseOrigamiController
       # Re-call Sale Data
       saleObj      = Sale.find(sale_id)
 
-      unique_code = "ReceiptBillA5Pdf"
+      unique_code = "ReceiptBillPdf"
       customer= Customer.find(saleObj.customer_id)
       
        #shop detail
diff --git a/app/models/printer/receipt_printer.rb b/app/models/printer/receipt_printer.rb
index 7a1ef65a..adcb187e 100755
--- a/app/models/printer/receipt_printer.rb
+++ b/app/models/printer/receipt_printer.rb
@@ -70,7 +70,7 @@ class Printer::ReceiptPrinter < Printer::PrinterWorker
     #Generate PDF
     #Print
 
-    pdf = ReceiptBillA5Pdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance)
+    pdf = ReceiptBillPdf.new(printer_settings, sale_items, sale_data, customer_name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details,printed_status,balance)
 
     # print as print copies in printer setting
     count = printer_settings.print_copies