From a4d2fc53b056caee3f6b3ae51de85b2fc07cb92c Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Fri, 4 Aug 2017 15:25:19 +0630
Subject: [PATCH] update

---
 app/models/order.rb                          |  3 +--
 app/views/origami/payments/show.html.erb     |  2 +-
 app/views/transactions/orders/index.html.erb | 21 ++++++++------------
 3 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/app/models/order.rb b/app/models/order.rb
index 714174fe..5f96e6d6 100644
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -322,8 +322,7 @@ class Order < ApplicationRecord
 
   def self.search(search)
     if search
-      # find(:all, :conditions => ['name LIKE ? OR contact_no LIKE ?', "%#{search}%", "%#{search}%"])
-      where("order_id LIKE ?", "%#{search}%")
+      where("order_id LIKE ? OR item_count ='#{search}'","%#{search}%",)
     else
       find(:all)
     end
diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index 83373b8e..77fedb16 100644
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -393,7 +393,7 @@ $( document ).ready(function() {
               $('#pay').text("Pay")
               $.confirm({
                 title: 'Infomation!',
-                content: 'Thank you !',
+                content: 'Thank you ! '+msg,
                 buttons: {
                   confirm: {
                   text: 'Ok',
diff --git a/app/views/transactions/orders/index.html.erb b/app/views/transactions/orders/index.html.erb
index 80befdc1..8463886f 100644
--- a/app/views/transactions/orders/index.html.erb
+++ b/app/views/transactions/orders/index.html.erb
@@ -1,7 +1,7 @@
 <div class="row">
   <div class="col-lg-12">
     <ol class="breadcrumb">
-       <li><a href="<%= crm_root_path %>">Home</a></li>
+       <li><a href="<%= dashboard_path %>">Home</a></li>
        <li class="active">
            <a href="<%= transactions_orders_path %>">Order</a>
        </li>
@@ -9,24 +9,19 @@
     </ol>
   </div>
 </div>
-<hr>
-
 <div class="row">
   <div class="col-lg-12">
       <div class="main-box-body clearfix">
+       <%= form_tag transactions_orders_path, :method => :get do %>
+       <div class="input-append col-md-4 form-group pull-right">
+        <input type="text" name="filter" placeholder="Order ID" class="form-control input-md col-md-8">&nbsp;
+        <button type="submit" class="btn btn-primary btn-md">Search</button>
+      </div>
+      <% end %>
         <div class="table-responsive">
           <table class="table table-striped">
             <thead>
-              <tr>
-                 <td colspan="6">
-                    <%= form_tag transactions_orders_path, :method => :get do %>
-                      <div class="input-append form-group pull-right">
-                        <input type="text" name="filter" placeholder="Order ID" class="form-control input-sm col-md-8">
-                        <button type="submit" class="btn btn-primary btn-sm">Search</button>
-                      </div>
-                    <% end %>
-                 </td>
-              </tr>
+              
               <tr>
                 <th>Order ID </th>
                 <th>Type</th>