diff --git a/Gemfile.lock b/Gemfile.lock
index 520eb9c8..051e1595 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -244,7 +244,6 @@ DEPENDENCIES
   jquery-rails
   kaminari (~> 0.16.3)
   listen (~> 3.0.5)
-
   mysql2 (>= 0.3.18, < 0.5)
   pg
   prawn
diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb
index bac414ad..c60efdac 100644
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -10,7 +10,7 @@ class Origami::PaymentsController < BaseOrigamiController
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      sale_payment.process_payment(saleObj, @user, cash)
+      sale_payment.process_payment(saleObj, @user, cash, "cash")
     end
   end
 
diff --git a/app/models/sale_payment.rb b/app/models/sale_payment.rb
index 834dba1f..d8aa1cee 100644
--- a/app/models/sale_payment.rb
+++ b/app/models/sale_payment.rb
@@ -8,7 +8,7 @@ class SalePayment < ApplicationRecord
 
   attr_accessor :received_amount, :card_payment_reference, :voucher_no, :giftcard_no, :customer_id, :external_payment_status
 
-  def process_payment(invoice, action_by, cash_amount,payment_method)
+  def process_payment(invoice, action_by, cash_amount, payment_method)
 
     self.sale = invoice
     self.received_amount = cash_amount
@@ -75,7 +75,7 @@ class SalePayment < ApplicationRecord
                 }
           )
         return response;
-      
+
   end
 
   def self.redeem(paypar_url,token,membership_id,received_amount,sale_id,campaign_type_id)
@@ -93,9 +93,9 @@ class SalePayment < ApplicationRecord
       else
         response =false;
       end
-      
+
       return response;
-      
+
   end
 
   private
@@ -103,7 +103,7 @@ class SalePayment < ApplicationRecord
     payment_status = false
     self.payment_method = "cash"
     self.payment_amount = self.received_amount
-    self.outstanding_amount = self.sale.grand_total - self.received_amount
+    self.outstanding_amount = self.sale.grand_total.to_f - self.received_amount.to_f
     self.payment_status = "paid"
     payment_method = self.save!
 
@@ -195,11 +195,10 @@ class SalePayment < ApplicationRecord
     if membership_data["status"]==true
       SalePayment.where(:sale_payment_id => self.sale_payment_id).update_all(:payment_status => 'paid')
       sale_update_payment_status(self.received_amount.to_f)
-      
+
     else
       sale_update_payment_status(0)
     end
-    
 
     return payment_status
 
@@ -207,9 +206,9 @@ class SalePayment < ApplicationRecord
 
   def sale_update_payment_status(paid_amount)
     #update amount_outstanding
-    self.sale.amount_received =   self.sale.amount_received + paid_amount
+    self.sale.amount_received =   self.sale.amount_received.to_f + paid_amount.to_f
     self.sale.amount_changed = paid_amount - self.sale.amount_received
-    if (self.sale.grand_total <=   self.sale.amount_received && self.sale.amount_changed > 0)
+    if (self.sale.grand_total <=   self.sale.amount_received.to_f && self.sale.amount_changed.to_f > 0)
       self.sale.payment_status = "paid"
       self.sale.sale_status = "completed"
       self.sale.save!
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index c2c15787..cb031eb3 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -165,14 +165,17 @@
 
 <script>
 $(document).on('click', '.cashier_number', function(event){
-        //event.stopPropagation();
-        event.preventDefault();
-        if(event.handled !== true) {
+        //
+        // event.stopPropagation();
+        // event.preventDefault();
+        console.log( event.handled );
+        if(event.handled == true) {
+
             var original_value;
             original_value = $('#cash').text();
 
             var input_type = $(this).attr("data-type");
-            
+
             switch (input_type) {
               case 'num':
               var input_value = $(this).attr("data-value");
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index 6f563b42..c4069679 100644
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -11,10 +11,10 @@ Rails.application.config.assets.version = '1.0'
 # Rails.application.config.assets.precompile += %w( search.js )
 
 # --- Waiter/ Cashier - Orgiami ----
-Rails.application.config.assets.precompile += %w( orgiami.css )
-Rails.application.config.assets.precompile += %w( orgiami.js )
+Rails.application.config.assets.precompile += %w( origami.css )
+Rails.application.config.assets.precompile += %w( origami.js )
 # -- Order Queue Station -----
 Rails.application.config.assets.precompile += %w( OQS.css )
-Rails.application.config.assets.precompile += %w( OQS.js ) 
+Rails.application.config.assets.precompile += %w( OQS.js )
 
 Rails.application.config.assets.precompile += %w( settings.css )