Merge branch 'staging'

app/controllers/origami/discounts_controller.rb

@@ -7,7 +7,7 @@ class Origami::DiscountsController < BaseOrigamiController
     if Sale.exists?(sale_id)
       @sale_data = Sale.find(sale_id)
     end
-
+    @member_discount = MembershipSetting.find_by_discount(1)
     @accounts = Account.all
   end
 
@@ -167,33 +167,39 @@ class Origami::DiscountsController < BaseOrigamiController
                                 'Accept'       => 'application/json'
                      }, :timeout => 10)
     rescue HTTParty::Error
-      response = {status: false, message: "Can't open membership server "}
+      response = {:status=> false, :message => "Can't open membership server " }
 
     rescue Net::OpenTimeout
-
-      response = { status: false , message: "Can't open membership server "}
-
+      response = {:status=> false, :message => "Can't open membership server " }
     rescue OpenURI::HTTPError
-      response = { status: false, message: "Can't open membership server "}
+      response = {:status=> false, :message => "Can't open membership server " }
 
     rescue SocketError
-      response = { status: false, message: "Can't open membership server "}
+      response = {:status=> false, :message => "Can't open membership server " }
     end
-
-    puts "ssssssssss"
-    puts response.to_json
     
     table_id = sale.bookings[0].dining_facility_id
     table_type = DiningFacility.find(table_id).type
-
+    puts response
+    puts "sssssssssss"
     # Re-calc All Amount in Sale
     if response["status"] == true
-         sale.compute_by_sale_items(sale_id, sale.sale_items, response["discount_earned"])
-    end   
-      result = {:status=> "Success", :table_id => table_id,:table_type => table_type }
-    # if response["status"] == false       
-    #      result = {:status=> "Success", :table_id => table_id,:table_type => table_type,:url_status => response[:status],:url_message => response[:message] }
-    # end
+        discount_amount = response["discount_earned"]
+        if response["discount_bonus_earned"]
+          discount_amount = discount_amount + response["discount_bonus_earned"]
+        end
+        sale.compute_by_sale_items(sale_id, sale.sale_items, discount_amount, 'member_discount')
+        result = {:status=> "Success",:title=>"Member Discount", :table_id => table_id,:table_type => table_type }
+    end
+       
+    if response["status"] == "500"
+        result = {:status=> response["error"],:title=>"Alert", :table_id => table_id,:table_type => table_type }
+    end 
+     if !response.nil?
+      if response[:status] == false
+        result = {:status=> response[:message],:title=>"Alert", :table_id => table_id,:table_type => table_type }
+      end
+     end
     
     render :json => result.to_json
   end

app/controllers/origami/home_controller.rb

@@ -4,7 +4,7 @@ class Origami::HomeController < BaseOrigamiController
   def index
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.where("sale_status != 'new'")
     @orders = Order.all.order('date desc')
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
@@ -13,7 +13,7 @@ class Origami::HomeController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.where("sale_status != 'new'")
     @orders = Order.all.order('date desc')
     @status_order = ""
     @status_sale = ""

app/controllers/origami/orders_controller.rb

@@ -3,7 +3,7 @@ class Origami::OrdersController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.where("sale_status != 'new'")
     @orders = Order.all.order('status desc')
     @order = Order.find(params[:order_id])
     sale_order = SaleOrder.find_by_order_id(@order.order_id)

app/controllers/origami/others_payments_controller.rb

@@ -6,6 +6,8 @@ class Origami::OthersPaymentsController < BaseOrigamiController
   	@sale_id = params[:sale_id]
   	@payment_method_setting = PaymentMethodSetting.all
 
+  	 @rebate = MembershipSetting.find_by_rebate(1)
+
   	# @sale_id = params[:sale_id]
   	# sale_data = Sale.find_by_sale_id(@sale_id)
 

app/controllers/origami/payments_controller.rb

@@ -18,7 +18,8 @@ class Origami::PaymentsController < BaseOrigamiController
     # customer= Customer.where('customer_id=' +.customer_id)
     customer= Customer.find(sale_data.customer_id)
     # get member information
-    if customer.membership_id != nil
+    rebate = MembershipSetting.find_by_rebate(1)
+    if customer.membership_id != nil && rebate
       member_info = Customer.get_member_account(customer)
     end
     # get printer info
@@ -55,7 +56,8 @@ class Origami::PaymentsController < BaseOrigamiController
        #shop detail
       shop_details = Shop.find(1)
       # get member information
-      if customer.membership_id != nil
+      rebate = MembershipSetting.find_by_rebate(1)
+      if customer.membership_id != nil && rebate
         member_info = Customer.get_member_account(customer)
         rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
       end
@@ -89,9 +91,9 @@ class Origami::PaymentsController < BaseOrigamiController
 
       #get customer amount
       @customer = Customer.find(@sale_data.customer_id)
-
+      rebate = MembershipSetting.find_by_rebate(1)
       # get member information
-      if @customer.membership_id != nil
+      if @customer.membership_id != nil && rebate
         response = Customer.get_member_account(@customer)
         if response["status"]==true
          response["data"].each do |res|
@@ -145,7 +147,8 @@ class Origami::PaymentsController < BaseOrigamiController
       #shop detail
       shop_details = Shop.find(1)
       # get member information
-      if customer.membership_id != nil
+      rebate = MembershipSetting.find_by_rebate(1)
+      if customer.membership_id != nil && rebate
         member_info = Customer.get_member_account(customer)
         rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
       end

app/controllers/origami/rooms_controller.rb

@@ -3,7 +3,7 @@ class Origami::RoomsController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.where("sale_status != 'new'")
     @orders = Order.all.order('date desc')
     @room = DiningFacility.find(params[:room_id])
     @sale_array = Array.new
@@ -31,9 +31,6 @@ class Origami::RoomsController < BaseOrigamiController
            end
          end
     end
-    puts "hhhhhhhhhh"
-    puts @status
-    puts @obj.to_json
   end
 
 

app/controllers/origami/sales_controller.rb

@@ -3,7 +3,7 @@ class Origami::SalesController < BaseOrigamiController
   def show
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
-    @complete = Sale.all
+    @complete = Sale.where("sale_status != 'new'")
     @orders = Order.all.order('date desc')
     @sale = Sale.find(params[:sale_id])
   end

app/controllers/origami/shifts_controller.rb

@@ -4,8 +4,6 @@ class Origami::ShiftsController < BaseOrigamiController
   end
 
   def show
-    puts ">>>>>"
-    puts current_user.id
     @shift = ShiftSale.current_open_shift(current_user.id)
   end