diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 1d8a0e99..936bc08a 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -306,16 +306,22 @@ class SalePayment < ApplicationRecord
     if generic_customer_id != nil || generic_customer_id != "" || generic_customer_id != 0
       paypar = sObj.sale_payments
       payparcost = 0
+      credit = 0
       paypar.each do |pp|
         if pp.payment_method == "paypar"
           payparcost = payparcost + pp.payment_amount
+        elsif 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 total_amount > 0
+      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")
diff --git a/lib/tasks/menu_import.rake b/lib/tasks/menu_import.rake
index 5db6231f..11f4fad2 100644
--- a/lib/tasks/menu_import.rake
+++ b/lib/tasks/menu_import.rake
@@ -67,7 +67,7 @@ menu_category3 = MenuCategory.create({menu: menu, code:"C003", name: "Beef & Mut
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0152", menu_item: menu_category1_menu_item7, price:8000.00, is_on_promotion:false}])
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0151", menu_item: menu_category1_menu_item7, price:16000.00, is_on_promotion:false}])
   # Sliced Beef （Thin）
-  menu_category1_menu_item8 = SimpleMenuItem.create({item_code:"01009", name: "Sliced Beef （Thin）", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  menu_category1_menu_item8 = SimpleMenuItem.create({item_code:"01009", name: "Sliced Beef ( Thin ）", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0162", menu_item: menu_category1_menu_item8, price:6000.00, is_on_promotion:false}])
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0161", menu_item: menu_category1_menu_item8, price:12000.00, is_on_promotion:false}])
   # Tender Sliced Beef
@@ -87,7 +87,7 @@ menu_category3 = MenuCategory.create({menu: menu, code:"C003", name: "Beef & Mut
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II0202", menu_item: menu_category1_menu_item12, price:7000.00, is_on_promotion:false}])
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II0201", menu_item: menu_category1_menu_item12, price:14000.00, is_on_promotion:false}])
   # Sliced Beef ( Think )
-  menu_category1_menu_item13 = SimpleMenuItem.create({item_code:"01014", name: "Sliced Beef ( Think )", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food })
+  menu_category1_menu_item13 = SimpleMenuItem.create({item_code:"01014", name: "Sliced Beef ( Thick )", alt_name: "Twin Pot",menu_category: menu_category3 , min_selectable_item: 1, max_selectable_item:1, account: food })
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Half Potion",item_instance_code:"II1432", menu_item: menu_category1_menu_item13, price:7000.00, is_on_promotion:false}])
     menu_item0_instance = MenuItemInstance.create([{item_instance_name:"Full Potion",item_instance_code:"II1431", menu_item: menu_category1_menu_item13, price:14000.00, is_on_promotion:false}])
 # Pork