From ab10a50a68b35165f568b4904d4142e8db1e4aca Mon Sep 17 00:00:00 2001
From: phyusin <phyusinthant@code2lab.com>
Date: Thu, 8 Nov 2018 10:37:41 +0630
Subject: [PATCH] membership settings UI

---
 app/views/origami/payments/show.html.erb      |  7 +++--
 .../membership_settings/show.html.erb         | 28 +++++++++++--------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/app/views/origami/payments/show.html.erb b/app/views/origami/payments/show.html.erb
index da1c1a2a..cde5e3d0 100755
--- a/app/views/origami/payments/show.html.erb
+++ b/app/views/origami/payments/show.html.erb
@@ -707,8 +707,9 @@ var customer_name = "<%= @customer.name %>";
 var pdf_view = '<%=@pdf_view%>';
 var trans_flag = <%= @trans_flag %>;
 var paymalcount = <%= @paymalcount %>;
-                // console.log(pdf_view)
-  $(document).ready(function(){
+// console.log(pdf_view)
+$(document).ready(function(){
+    $("#sxModal").hide();
     if(cashier_type == "food_court" && paymalcount == 0.0){
       $("#is_paymemberModal").modal({show : true, backdrop : false, keyboard : false});
     }
@@ -1663,7 +1664,7 @@ var paymalcount = <%= @paymalcount %>;
     }
   });
 
-  // Read Card Reader
+  // Read Card Reader - Paymal payment for FoodCourt
   $(".btn_paymal_member").on('click', function (){  
     var cardNo = ""; 
     var sale_id     = $("#sale_id").text() || 0;
diff --git a/app/views/settings/membership_settings/show.html.erb b/app/views/settings/membership_settings/show.html.erb
index 81a14b17..1d81ca7c 100755
--- a/app/views/settings/membership_settings/show.html.erb
+++ b/app/views/settings/membership_settings/show.html.erb
@@ -1,12 +1,11 @@
-
 <div class="page-header">
- <ul class="breadcrumb">
-  <li><a href="<%= root_path %>">Home</a></li>
-  <li><a href="<%= settings_membership_settings_path %>">Membership Setting</a></li>
-  
-  <span style="float: right">
-  </span>
- </ul>
+  <ol class="breadcrumb">
+    <li class="breadcrumb-item"><a href="<%= dashboard_path %>"><%= t("views.right_panel.button.home") %></a></li>
+     <li class="breadcrumb-item"><%= t("views.right_panel.detail.membership_setting") %></li>
+    <span class="float-right">
+      <%= link_to t('.back', :default => t("views.btn.back")), dashboard_path %>
+    </span>
+  </ol>
 </div>
 <div class="card">
   <div class="card-block">
@@ -34,9 +33,16 @@
           <td><%= @settings_membership_setting.auth_token %></td>
           <td><%= @settings_membership_setting.merchant_account rescue ''%></td>
           <td><%= @settings_membership_setting.created_by %></td>
-          <td>
-              <%= link_to t("views.btn.edit"), edit_settings_membership_setting_path(@settings_membership_setting) %> |
-<%= link_to t('.new', :default => t("views.btn.new")), settings_membership_settings_path %>
+          <td colspan="" align="">
+            <%= link_to t("views.btn.edit"), edit_settings_membership_setting_path(@settings_membership_setting),:class => 'btn btn-primary btn-sm waves-effect' %>
+            <button class="delete btn btn-danger btn-sm waves-effect" data-ref="<%= settings_membership_settings_path(@settings_membership_setting)%>" data-method="delete" disabled>
+                <%= t("views.btn.delete") %>
+            </button>
+
+            <span class="hidden" id="delete_text">
+                <h6>Are you sure you want to delete this row ?</h6>
+                <h6>This action can't be undo. </h6> 
+            </span>
           </td>
         </tr>
       </tbody>