From 46e7431d1ebb4a3c5e4ebf47ec48d3fbe2952ecf Mon Sep 17 00:00:00 2001
From: Aung Myo <aungmyo.zaw@code2lab.com>
Date: Tue, 17 Oct 2017 10:06:17 +0630
Subject: [PATCH] update admin confirm box

---
 app/assets/javascripts/addorder.js         |  4 ++--
 app/views/crm/customers/_new_form.html.erb |  6 +++---
 app/views/crm/customers/index.html.erb     | 23 ++++------------------
 app/views/layouts/application.html.erb     |  4 +++-
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/app/assets/javascripts/addorder.js b/app/assets/javascripts/addorder.js
index f615a28d..50dc4741 100644
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -378,9 +378,9 @@ $(function(){
     item_options       = $(this).data('option');
 
     if (data.attr('data-image')) {
-      image = "<img id='' src='"+data.attr('data-image')+"'>";
+      image = "<img id='' width='200px' src='"+data.attr('data-image')+"'>";
     }else{
-       image = "<img id='' src='/image/logo.png'>";
+       image = "<img id='' width='200px' src='/image/logo.png'>";
     }
     
     $('#modal_box_img').append(image);
diff --git a/app/views/crm/customers/_new_form.html.erb b/app/views/crm/customers/_new_form.html.erb
index 8687d25f..bba21b02 100644
--- a/app/views/crm/customers/_new_form.html.erb
+++ b/app/views/crm/customers/_new_form.html.erb
@@ -132,9 +132,9 @@
   </div>
   
   <div class="form-group">
-        <%= f.button :submit, "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
-        <%= f.button :submit, "Update",:class => 'btn btn-primary ', :disabled =>'', :id => 'update_customer' %>
-        <%= f.button :button, "Reset",:class => 'btn btn-danger ', :id => 'reset' %>
+        <%= f.submit "Submit",:class => 'btn btn-primary ', :id => 'submit_customer' %>
+        <%= f.submit "Update",:class => 'btn btn-info ', :disabled =>'', :id => 'update_customer' %>
+        <button type="button" class="btn btn-danger" id="reset">Reset</button>
   </div>
  <%end%>
 
diff --git a/app/views/crm/customers/index.html.erb b/app/views/crm/customers/index.html.erb
index fcea1c60..8473ecf6 100644
--- a/app/views/crm/customers/index.html.erb
+++ b/app/views/crm/customers/index.html.erb
@@ -35,22 +35,14 @@
                <%= form_tag crm_customers_path, :id => "filter_form", :method => :get do %>
                <div class="row clearfix">
                 <div class="col-lg-5 col-md-5 col-sm-5 col-xs-12">
-                  <div class="form-group">
-                    <!-- <div class="form-line"> -->
                       <input type="text" name="filter" style="margin-right:10px" placeholder="Search" id="search" class="form-control">
                       <input type="hidden" name="type" id="type" value="">
-                    <!-- </div> -->
-                  </div>
                 </div>
-                <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12">
-                  <button type="submit" class="btn bg-blue waves-effect">Search</button>
-                </div>
-                <!-- <div class="col-lg-3 col-md-3 col-sm-3 col-xs-12" id="member_acc_no"> -->
-                  <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;">Member Card</button>
-                <!-- </div> -->
-                <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12" id="qr_code"> -->
-                  <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="height: 30%;margin-right: 10px;">QR CODE</button>
+                <!-- <div class="col-lg-2 col-md-2 col-sm-2 col-xs-12"> -->
+                  <button type="submit" class="btn bg-blue waves-effect" style="margin-right: 10px;">Search</button>
                 <!-- </div> -->
+                  <button type="button" id="member_acc_no" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;">Member Card</button>
+                  <button type="button" id="qr_code" class="btn bg-green btn-sm waves-effect" style="margin-right: 10px;">QR CODE</button>
               </div>
               <% end %>
 
@@ -102,13 +94,6 @@
     <div class="col-lg-4 col-md-4 col-sm-4">
     <div id="custom-slimscroll">
     <%= render 'new_form', crm_customer: @crm_customer, taxes: @taxes %>
-
-    <div class="col-lg-1 col-md-1 col-sm-1">
-    <br>
-       <a href="<%= dashboard_path%>" class="btn btn-primary">
-       Back
-       </a>
-    </div>
     </div>
     <!-- <div class="col-lg-1 col-md-1 col-sm-1 ">
       <br>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 2e60e6d6..11c77361 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -15,8 +15,10 @@
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
 
     <%= stylesheet_link_tag    'application', media: 'all', 'data-turbolinks-track': 'reload' %>
-    
+    <%= stylesheet_link_tag    'jquery-confirm', media: 'all', 'data-turbolinks-track': 'reload' %>
+
     <%= javascript_include_tag 'application', 'data-turbolinks-track': 'reload' %> 
+    <%= javascript_include_tag 'jquery-confirm', 'data-turbolinks-track': 'reload' %>
 </head>
 
 <body class="theme-red">