diff --git a/app/views/layouts/login.html.erb b/app/views/layouts/login.html.erb
index e6cf13ce..aa97bce7 100755
--- a/app/views/layouts/login.html.erb
+++ b/app/views/layouts/login.html.erb
@@ -88,63 +88,7 @@
             <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
           </div>              
         </div>
-<<<<<<< HEAD
-        <div class="card-content">
-          <div class='col-md-12'>
-            <div class='row bottom'>
-              <div class="pin_pad " data-value="1">1</div>
-              <div class="pin_pad left" data-value="2">2</div>
-              <div class="pin_pad left" data-value="3">3</div>
-            </div>
-            <div class='row bottom'>
-              <div class="pin_pad" data-value="4">4</div>
-              <div class="pin_pad left" data-value="5">5</div>
-              <div class="pin_pad left" data-value="6">6</div>
-            </div>
-            <div class='row bottom'>
-              <div class="pin_pad" data-value="7">7</div>
-              <div class="pin_pad left" data-value="8">8</div>
-              <div class="pin_pad left" data-value="9">9</div>
-            </div>
-            <div class='row bottom'>
-              <div class="pin_pad bg-grey" data-value="CLR">CLR</div>
-              <div class="pin_pad left" data-value="0">0</div>
-              <div class="pin_pad left bg-indigo" data-value="ENT">ENT</div>
-            </div>                      
-          </div>
-        </div>
-        <% end %>
-      </div>
-      <script type="text/javascript">
-        $(document).on('turbolinks:load', function () {
-
-         // for Notificaiotn message
-         console.log("hi")
-         var placementFrom  = $("#noti").attr('data-placement-from');
-         var placementAlign = $("#noti").attr('data-placement-align');
-         var animateEnter   = $("#noti").attr('data-animate-enter');
-         var animateExit    = $("#noti").attr('data-animate-exit');
-         var colorName      = $("#noti").attr('data-color-name');
-         var text           = $("#noti").attr('data-message');
-
-         if (text != null || colorName != null){
-          showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit); 
-        }
-
-        $(".empBtn").click(function (event) {
-          event.preventDefault();
-          var item = $(this).data("formid");
-          $(item).submit();
-=======
-            <%= simple_form_for(@login_form, url: login_path, method: "post") do |f| %>
-                <div class="card padding-10">
-                  <div class="card-header">
-                    <div class="form-group">
-                      <%= f.input :emp_id, as: :hidden, required: false, class: "form-control" %>
-
-                      <%= f.input :password, label: "Access PIN", required: false, class: "form-control" %>
-                    </div>              
-                  </div>
+          
                   <div class="card-content">
                     <div class='col-md-12'>
                       <div class='row bottom'>
@@ -188,27 +132,6 @@
                     $("#login_form_password").val(old_value + value);
                 }
             });
-           
->>>>>>> e3b536d58c98873e6f043a19ec1b4eb4545736a1
-        });
-
-      });
-        $(document).on('turbolinks:load', function () {
-          $(".pin_pad").click(function (event) {
-            event.preventDefault();
-            console.log($(this).data("value"));
-            var value = $(this).data("value");
-
-            if (value == "CLR") {
-              $("#login_form_password").val("");
-            } else if (value == "ENT") {
-              $("#new_login_form").submit();
-            } else {
-              var old_value = $("#login_form_password").val();
-              $("#login_form_password").val(old_value + value);
-            }
-          });
-          
         });
         function showNotification(colorName, text, placementFrom, placementAlign, animateEnter, animateExit) {
           if (colorName === null || colorName === '') { colorName = 'bg-black'; }
diff --git a/app/views/origami/sales/show.html.erb b/app/views/origami/sales/show.html.erb
index c6665b6a..71792746 100755
--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -231,20 +231,43 @@ $('#back').on('click',function(){
   window.location.href = '/origami/';
 })
 
-$('#void').on('click',function () {
-      var sure = confirm("Are you sure want to Void");
-      if (sure == true) {
-          var sale_id = $('#sale_id').val();
-          var ajax_url = "/origami/sale/" + sale_id + '/void';
-          $.ajax({
-              type: 'POST',
-              url: ajax_url,
-              success: function () {
-                  window.location.href = '/origami/';
-              }
-          });
-      }
-  });
+// $('#void').on('click',function () {
+//       var sure = confirm("Are you sure want to Void");
+//       if (sure == true) {
+//           // var sale_id = $('#sale_id').val();
+//           // var ajax_url = "/origami/sale/" + sale_id + '/void';
+//           // $.ajax({
+//           //     type: 'POST',
+//           //     url: ajax_url,
+//           //     success: function () {
+//           //         window.location.href = '/origami/';
+//           //     }
+//           // });
+//       }
+//   });
+ $('#void').on('click', function () {
+        swal({
+            title: "Alert",
+            text: "Are you sure want to Void?",
+            type: "warning",
+            showCancelButton: true,
+            confirmButtonColor: "#DD6B55",
+            confirmButtonText: "Yes, void it!",
+            closeOnConfirm: false
+        }, function (isConfirm) {
+          if (isConfirm) {
+            var sale_id = $('#sale_id').val();
+            var ajax_url = "/origami/sale/" + sale_id + '/void';
+            $.ajax({
+                type: 'POST',
+                url: ajax_url,
+                success: function () {
+                    window.location.href = '/origami/sale/'+sale_id;
+                }
+            });
+          }
+        });
+    });
 
 $('#re-print').click(function() {
     var sale_id = $('#sale_id').val();