From 98c4737a2affcbe638218d8748f9fd4f42f59597 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 20 Feb 2018 16:09:11 +0630
Subject: [PATCH] fixed minor issuse

---
 app/assets/javascripts/addorder.js                  | 2 +-
 app/controllers/origami/request_bills_controller.rb | 4 +---
 app/views/origami/payments/show.html.erb            | 6 +++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index cefa64fb..b9b03c3e 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -102,7 +102,7 @@ $(function() {
             instances = menu_items[field].instances ;
 
             if (!instances.length > 0) {
-              swal("Hello Please Check!","doesn't not have instance item in this menu items ("+ menu_items[field].name+")","warning");
+              swal("Hello Please Check!","Does not have instance item in this menu items ("+ menu_items[field].name+")","warning");
             }
             if (instances.length > 0) {
               qty = 1;
diff --git a/app/controllers/origami/request_bills_controller.rb b/app/controllers/origami/request_bills_controller.rb
index 39296119..39ef789a 100755
--- a/app/controllers/origami/request_bills_controller.rb
+++ b/app/controllers/origami/request_bills_controller.rb
@@ -5,9 +5,7 @@ class Origami::RequestBillsController < ApplicationController
     @sale = Sale.new
     sale_order=SaleOrder.new
 
-    # if shift = ShiftSale.current_open_shift(current_user.id)
-    puts ShiftSale.current_shift
-    puts "sssssssssss"
+    # if shift = ShiftSale.current_open_shift(current_user.id)SSS
     if !ShiftSale.current_shift.nil?
       order_id = params[:id] # order_id
       bk_order = BookingOrder.find_by_order_id(order_id)
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 96f69da9..1dbe960f 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -396,7 +396,7 @@
           var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1) + parseFloat(unionpay1);
           var total = $('#amount_due').text();
           var amt = parseFloat(total) - parseFloat(othertotal);
-          $('#cash').text(parseFloat(amt).toFixed(2));
+          $('#cash').text(parseFloat(amt).toFixed(1));
           update_balance();
         break;
       }
@@ -485,7 +485,7 @@
                 $( "#loading_wrapper" ).hide();
                 if($('#balance').text() < 0){
                   swal({
-                    title: "Information!",
+                    title: "Payment Successful!",
                     text: 'Changed amount  ' + $('#balance').text() * (-1),
                     html: true,
                     closeOnConfirm: false,
@@ -497,7 +497,7 @@
                 }else{         
                   $('#pay').text("Pay");
                   swal({
-                   title: "Information!",
+                   title: "Payment Successful!",
                    text: 'Thank You !',
                    html: true,
                    closeOnConfirm: false,