From 0c084a181677a2e5f79fd5b76031262fa970d8bc Mon Sep 17 00:00:00 2001
From: Yan <yanaung.nyein@code2lab.com>
Date: Mon, 27 Nov 2017 14:24:34 +0630
Subject: [PATCH] credit payment fix when visa assign

---
 app/controllers/origami/credit_payments_controller.rb      | 2 +-
 app/controllers/settings/menu_item_instances_controller.rb | 2 +-
 app/views/origami/credit_payments/index.html.erb           | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/origami/credit_payments_controller.rb b/app/controllers/origami/credit_payments_controller.rb
index a4978a6f..fde9d6f7 100755
--- a/app/controllers/origami/credit_payments_controller.rb
+++ b/app/controllers/origami/credit_payments_controller.rb
@@ -8,7 +8,7 @@ class Origami::CreditPaymentsController < BaseOrigamiController
     @creditcount = 0
     others = 0
     sale_data.sale_payments.each do |sale_payment|
-        if sale_payment.payment_method == "visa"
+        if sale_payment.payment_method == "creditnote"
           @creditcount = @creditcount + sale_payment.payment_amount
         else
           others = others + sale_payment.payment_amount
diff --git a/app/controllers/settings/menu_item_instances_controller.rb b/app/controllers/settings/menu_item_instances_controller.rb
index f34dc5c5..a214ffec 100755
--- a/app/controllers/settings/menu_item_instances_controller.rb
+++ b/app/controllers/settings/menu_item_instances_controller.rb
@@ -67,7 +67,7 @@ class Settings::MenuItemInstancesController < ApplicationController
 
     respond_to do |format|
       if @settings_menu_item_instances.save
-        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].reject(&:blank?)
+        @settings_menu_item_instances.item_attributes = params[:menu_item_instance][:item_attributes].split(" ")
         @settings_menu_item_instances.save
         format.html { redirect_to settings_menu_category_simple_menu_item_path(category,catID), notice: 'Menu item instance was successfully created.' }
         format.json { render :show, status: :created, location: @settings_menu_item_instances }
diff --git a/app/views/origami/credit_payments/index.html.erb b/app/views/origami/credit_payments/index.html.erb
index e9ccc8c4..a3243b57 100755
--- a/app/views/origami/credit_payments/index.html.erb
+++ b/app/views/origami/credit_payments/index.html.erb
@@ -40,13 +40,13 @@
           <!-- </div> -->
           <% end %>
           <!-- <div class="row"> -->
-          <div class="row">
+          <!-- <div class="row">
            <div class="col-lg-5 col-md-5 col-sm-5">
              <label >Recent Credit Amount</label>
            </div>
            <div class="col-lg-6 col-md-6 col-sm-6">
             <input type="text" name="valid_amount" id="valid_amount" class="form-control" value="" data-value="<%=@sale_id %>" data-member-value="">
-          </div>
+          </div> -->
         </div>
         <hr>
         <!-- </div> -->