merge with master

2018-01-09 16:40:45 +06:30
parent 13ec405437 afd893d831
commit 2b50ae5fb9
91 changed files with 2666 additions and 744 deletions
--- a/app/controllers/origami/addorders_controller.rb
+++ b/app/controllers/origami/addorders_controller.rb
@@ -62,9 +62,21 @@ 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]
+    is_extra_time = false
+    extra_time = ''
+
    items_arr = []
    JSON.parse(params[:order_items]).each { |i| 
+       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"] == 'Extim30' || i["item_instance_code"] == 'Extie30'
+           time = 30*60*i["quantity"].to_i
+           extra_time = Time.at(time)
+         else
+           time = 60*60*i["quantity"].to_i
+           extra_time = Time.at(time)
+         end
+       end
       items = {"order_item_id": i["order_item_id"],"item_instance_code": i["item_instance_code"],"quantity": i["quantity"],"options": i["options"]}
       items_arr.push(items)
     }
@@ -80,36 +92,34 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
    @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.
-        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])
+
+          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)
+                  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])
+                  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
        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")
--- 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"}
--- 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"]
--- 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::MembershipSetting
+    @payment_methods = PaymentMethodSetting.all
+    
    @dining.bookings.active.each do |booking|
        if booking.sale_id.nil? && booking.booking_status != 'moved'
          @order_items = Array.new
--- 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)

--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -22,6 +22,7 @@ class Origami::PaymentsController < BaseOrigamiController
    cashier_terminal = CashierTerminal.find(cashier_zone.cashier_terminal_id)

    # Print for First Bill to Customer
+<<<<<<< HEAD
    # unique_code = "ReceiptBillPdf"
    #  #shop detail
    # shop_details =  Shop::ShopDetail 
@@ -45,6 +46,48 @@ class Origami::PaymentsController < BaseOrigamiController
    # printer = Printer::ReceiptPrinter.new(print_settings)

    # printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt")        
+=======
+    unique_code = "ReceiptBillPdf"
+     #shop detail
+    shop_details =  Shop::ShopDetail 
+    # customer= Customer.where('customer_id=' +.customer_id)
+    customer = Customer.find(sale_data.customer_id)
+
+    # rounding adjustment
+      if shop_details.is_rounding_adj
+        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
+          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
+      member_info = Customer.get_member_account(customer)
+      # current_balance = SaleAudit.paymal_search(sale_id)
+      current_balance = 0
+    end
+    # get printer info
+    print_settings=PrintSetting.find_by_unique_code(unique_code)
+
+    # find order id by sale id
+    # sale_order = SaleOrder.find_by_sale_id(@sale_data.sale_id)
+
+    # Calculate price_by_accounts
+    item_price_by_accounts = SaleItem.calculate_price_by_accounts(sale_items)
+    discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale_items)
+
+    printer = Printer::ReceiptPrinter.new(print_settings)
+
+    printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details, "Frt",current_balance)    
+>>>>>>> master
  end

  def create
@@ -58,9 +101,15 @@ 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 # 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)        
+        end
      end
      #end rounding adjustment

@@ -234,6 +283,12 @@ class Origami::PaymentsController < BaseOrigamiController

    if(Sale.exists?(sale_id))
      saleObj      = Sale.find(sale_id)
+         
+      if saleObj.discount_type == "member_discount"
+        saleObj.update_attributes(rounding_adjustment: 0)
+        saleObj.compute_by_sale_items(sale_id, saleObj.sale_items,0)
+      end
+      
      sale_payment = SalePayment.new
      sale_payment.process_payment(saleObj, @user, cash, "foc")

@@ -280,14 +335,15 @@ 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 # 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)
+        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
--- a/app/controllers/origami/rooms_controller.rb
+++ b/app/controllers/origami/rooms_controller.rb
@@ -19,6 +19,10 @@ 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
--- 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
--- 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
@@ -38,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