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

app/controllers/crm/customers_controller.rb

@@ -74,7 +74,7 @@ class Crm::CustomersController < BaseCrmController
       @response        = Customer.get_membership_transactions(@customer)
 
       Rails.logger.debug "get membership transactions response"
-      Rails.logger.debug response.to_json
+      Rails.logger.debug @response.to_json
       # @response = ""
       #end customer amount
 

app/controllers/origami/addorders_controller.rb

@@ -44,6 +44,17 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
     end
   end
 
+
+  def get_menu_sub_category ()
+    id = params[:id]
+    if (id)
+      #Pull this menu
+      @sub_menu = MenuCategory.where("menu_category_id = #{id}").active
+      # puts @menu.menu_items[1].item_attributes.to_json
+      return @sub_menu
+    end
+  end
+  
   def get_all_product()
       @product = Product.all   
   end

app/controllers/origami/discounts_controller.rb

@@ -29,8 +29,6 @@ class Origami::DiscountsController < BaseOrigamiController
       # sale.grand_total = (sub_total.to_f - overall_discount.to_f) + sale.total_tax;  
       # sale.save   
       if discount_items.length > 0
-        puts discount_items.to_json
-        puts "dddddddddddd"
 
         #save sale item for discount
         discount_items.each do |di|

app/models/sale_payment.rb

@@ -323,7 +323,7 @@ class SalePayment < ApplicationRecord
      
       self.sale.sale_status = "completed"
 
-      if MembershipSetting.find_by_rebate(1) && is_foc == 0
+      if MembershipSetting.find_by_rebate(1) && is_foc == 0 && is_credit == 0
         response = rebat(sObj)
         
          #record an payment in sale-audit
@@ -414,6 +414,7 @@ class SalePayment < ApplicationRecord
       # overall_dis = SaleItem.get_overall_discount(sObj.id)
       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
@@ -442,6 +443,7 @@ class SalePayment < ApplicationRecord
         rescue SocketError
            response = { "status": false, "message": "Can't connect server"}
         end
+
         redeem_amount = payparcost + overall_dis
 
         total_percentage = 0
@@ -482,6 +484,7 @@ class SalePayment < ApplicationRecord
         if credit == 1
           total_amount = 0
         end
+
         if total_amount >= 0
        		receipt_no        = sObj.receipt_no
           membership        = MembershipSetting.find_by_membership_type("paypar_url")
@@ -520,9 +523,9 @@ class SalePayment < ApplicationRecord
           Rails.logger.debug response.to_json
           return response
         end
+      end
     else
        response = { "status": "no_member", "message": "Not membership"}  
-   
     end
 
   end

app/pdf/receipt_bill_pdf.rb

@@ -294,6 +294,7 @@ class ReceiptBillPdf < Prawn::Document
                 balance = 0
                 rebate_balance =0
                 redeem = 0
+                redeem_count = 0
                 rebate_amount["data"].each do |res|
                     total = total + res["balance"]
                 #total redeem amount
@@ -318,7 +319,7 @@ class ReceiptBillPdf < Prawn::Document
                         
                     end 
                 # Total Rebate Amount if birthday
-                    if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebateBonusAccount" && res["status"]== "Rebate"
+                    if res["receipt_no"]== sale_data.receipt_no && res["account_status"]== "RebatebonusAccount" && res["status"]== "Rebate"
                          rebate_balance = rebate_balance + res["deposit"]
                         move_down 5
                         y_position = cursor
@@ -345,7 +346,9 @@ class ReceiptBillPdf < Prawn::Document
                  if redeem == 0
                     old = total - rebate_balance
                  else
+                    # if redeem_count == 0
                        old = balance + redeem
+                    # end
                  end
 
                  move_down 5

app/views/origami/addorders/get_menu_sub_category.json.jbuilder

@@ -0,0 +1,9 @@
+if @sub_menu
+	json.sub_category @sub_menu.each do |sub_cat|
+		json.id                 sub_cat.id
+		json.code               sub_cat.code
+		json.name               sub_cat.name
+		json.menu_id            sub_cat.menu_id
+		json.menu_category_id   sub_cat.menu_category_id
+	end
+end

config/routes.rb

@@ -189,6 +189,7 @@ scope "(:locale)", locale: /en|mm/ do
     post '/:id/create_survey' => "surveys#create", :as => "create_surveys"
 
     get '/addorders/get_menu_category/:id' => "addorders#get_menu_category",:as => "get_menu_category", :defaults => { :format => 'json' }
+    get '/addorders/get_menu_sub_category/:id' => "addorders#get_menu_sub_category",:as => "get_menu_sub_category", :defaults => { :format => 'json' }
     get '/addorders/products/list' => "addorders#get_all_product",:as => "get_all_product", :defaults => { :format => 'json' }
 
     get '/:addorders/:id' => "addorders#detail"