From 7c39f8f7eb02e8733ccca665956d1153c7d44a00 Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Thu, 23 Nov 2017 19:01:06 +0630
Subject: [PATCH] update addorder

---
 app/assets/javascripts/addorder.js           | 22 ++++++++++----------
 app/views/transactions/orders/index.html.erb |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index 88301de6..1f37d934 100755
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -563,19 +563,19 @@ $(function() {
 
       for(var field in instances) {   
         
-      attrbu = JSON.stringify(attribute_arr);
-      instan = JSON.stringify(instances[field].values);   
-      var newarr = new Set(instan);
+        attrbu = JSON.stringify(attribute_arr);
+        instan = JSON.stringify(instances[field].values);   
+        var newarr = new Set(instan);
 
-      result = false;
-      for(var i in attrbu) {   
-          if (newarr.has(attrbu[i])) {
-            result = true;
-            break;
-          }
+        result = false;
+        for(var i in attrbu) {   
+            if (newarr.has(attrbu[i])) {
+              result = true;
+              break;
+            }
 
-      }
-        if (JSON.stringify(attribute_arr) === JSON.stringify(instances[field].values) || result) {
+        }
+        if (JSON.stringify(attribute_arr) === JSON.stringify(instances[field].values)) {
           $('.add_to_order').attr('data-instance-code',instances[field].code);
           $('.add_to_order').attr('data-instance',instances[field].name);
           $('.add_to_order').attr('data-price',instances[field].price);
diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb
index ce8a7607..2fdef7bf 100755
--- a/app/views/transactions/orders/index.html.erb
+++ b/app/views/transactions/orders/index.html.erb
@@ -92,7 +92,7 @@
 
 <script type="text/javascript">
   $(function(){
-    $("#receipt_no").val("<%=params[:receipt_no]%>");
+    $("#receipt_no").val("<%=params[:filter]%>");
     $("#from").val("<%=params[:from]%>");
     $("#to").val("<%=params[:to]%>");
   });