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

app/controllers/api/order_reserve/order_reservation_controller.rb

@@ -2,7 +2,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 	# skip_before_action  :authenticate
   	ORDER = "order"
   	RESERVATION = "reservation"
-  	ORDER_RESERVATION = "order and reservation"
+  	ORDER_RESERVATION = "order_and_reservation"
 
 	def check_customer
 		customer_id  = 0
@@ -42,6 +42,8 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			else
 				status = true
 			end
+		elsif !params[:callback_url]
+			render :json => { :status => false, :message => "callback_url is required!" }
 		end
 
 		if status == true

app/controllers/origami/movetable_controller.rb

@@ -71,8 +71,10 @@ class Origami::MovetableController < BaseOrigamiController
 
         booking.booking_orders.each do |booking_order|
           order = Order.find(booking_order.order_id)
-          order.order_items.each do |order_item|
-            order_items.push(order_item)
+          if order.status == 'new'
+            order.order_items.each do |order_item|
+              order_items.push(order_item)
+            end
           end
         end
       end

app/models/customer.rb

@@ -360,7 +360,7 @@ class Customer < ApplicationRecord
     customer.contact_no       = params[:contact_no]
     customer.gender           = params[:gender]
     customer.address          = params[:address]
-    customer.date_of_birth    = Time.parse(params[:date_of_birth]).strftime("%Y-%m-%d")
+    customer.date_of_birth    = params[:date_of_birth] ? Time.parse(params[:date_of_birth]).strftime("%Y-%m-%d") : ''
     customer.membership_id    = params[:membership_id]
     customer.customer_type    = "Takeaway"
     customer.tax_profiles     = ["2"]

app/models/order_reservation.rb

@@ -13,6 +13,7 @@ class OrderReservation < ApplicationRecord
 		order_reservation.customer_id = params[:cus_info]
 		order_reservation.requested_time = Time.parse(params[:requested_time]).utc.strftime("%Y-%m-%d %H:%M:%S")
 		if params[:order_info]
+			order_reservation.callback_url = params[:order_info][:callback_url]
 			order_reservation.item_count = params[:order_info][:items].count
 			order_reservation.payment_type = params[:payment_info][:payment_type]
 			order_reservation.payment_status = params[:payment_info][:payment_status]
@@ -21,7 +22,7 @@ class OrderReservation < ApplicationRecord
 			order_reservation.total_tax = params[:payment_info][:total_tax]
 			order_reservation.discount_amount = params[:payment_info][:discount_amount]
 			order_reservation.grand_total = params[:payment_info][:grand_total]
-			order_reservation.order_remark = params[:payment_info][:order_remark]
+			order_reservation.order_remark = params[:order_info][:order_remark]
 		end
 		if params[:reservation_info]
 			order_reservation.total_customer = params[:reservation_info][:total_user]

app/views/origami/payments/show.html.erb

@@ -1132,16 +1132,40 @@ var customer_name = "<%= @customer.name %>";
   // QR Code Reader
   $(".btn_qr_code").on('click', function(e){
     $("#is_memberModal").hide();
-    var code = "";        
+    var code = "";  
+    var customer_id = '';
+    var customer_name = '';
+    var membership_id = '';
+    var membership_type = '';    
     setTimeout(function(){
-       code=getQRCode(); 
-       $("#qr_code").val(code);          
+      code=getQRCode(); 
+      if(sale_id != 0 && code != ""){    
+        $.ajax({
+          type: "POST",
+          url: "/origami/"+sale_id+"/get_customer" ,
+          data: { filter : code ,type :"card"},
+          dataType: "json",
+          success: function(data) {
+            if (data[0].customer_id == false) {
+              swal("Alert!", data[0].message, "error");
+            }else{
+              customer_id = data[0].customer_id;
+              customer_name = data[0].name;
+              membership_id = data[0].membership_id;
+              membership_type = data[0].membership_type;
+              update_sale(membership_id, customer_id, customer_name,sale_id);
+            }
+
+          }
+        });                
+      }         
     },100);
   });
 
   // Read qrcode from java
   function getQRCode(){
     return code2lab.readQRCode();
+    $("#qr_code").val(code);  
   }
 
   function update_sale(membership_id, customer_id, customer_name, sale_id) {

app/views/reports/receipt_no/index.html.erb

@@ -107,7 +107,7 @@
 							<%end%>
 
 							<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><%= result.rounding_adjustment.to_f rescue '-' %></td>			
 							<td><%= number_with_precision(result.grand_total_after_rounding(), precision: precision.to_i ,delimiter: delimiter) rescue '-' %></td>
 						</tr>
 
@@ -120,7 +120,7 @@
 							<td><b><%= number_with_precision(tax.st_amount, precision: precision.to_i ,delimiter: delimiter) rescue '-' %></b></td>
 							<% end %>
 							<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><%= rounding_adj.to_f 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>