update setting admin pages

2017-10-24 18:16:03 +06:30
parent 85e2c48e5e
commit 34a4e485af
31 changed files with 263 additions and 181 deletions
--- a/app/views/origami/addorders/detail.html.erb
+++ b/app/views/origami/addorders/detail.html.erb
@@ -3,7 +3,7 @@
 <div id="loading_wrapper" style="display:none;">
    <div id="loading"></div>
  </div>
-<div class="row">
+<div class="row m-t--20">
    <div class="col-lg-2 col-md-2 col-sm-2">
        <ul class="nav nav-tabs flex-column" role="tablist" >
            <% @menu.each do |menu| %>
@@ -19,17 +19,17 @@
            </li>
        </ul>
    </div>
-    <div class="col-md-7 col-lg-7 col-sm-7">
+    <div class="col-md-7 col-lg-7 col-sm-7 m-t-10">
      <div class="card-columns custom-card-columns menu_items_list" style="column-gap: 10px;">
         <!-- append data -->
      </div>
    </div>

-    <div class="col-md-3 col-lg-3 col-sm-3">
+    <div class="col-md-3 col-lg-3 col-sm-3 m-t-10">
        <button type="button" class="btn btn-primary btn-md float-right" id="back"><i class="fa fa-arrow-left"></i> BACK </button> <br>
        <div class="card-header">
          <div>
-             <strong id="order-title">ORDER DETAILS </strong> |  Table <%=@table.name%>
+             <strong id="order-title">ORDER DETAILS </strong>| Table<%=@table.name%>
             <p class="hidden" id="table_id"><%=@table_id%></p>
             <p class="hidden" id="table_type"><%=@table.type%></p>
             <p class="hidden" id="booking_id"><%=@booking_id%></p>
--- a/app/views/origami/home/show.html.erb
+++ b/app/views/origami/home/show.html.erb
@@ -127,7 +127,7 @@
            </div>
            <div class="card-block">
              <div class="card-title">
-                <div class="row">
+                <div class="row p-l-5 p-r-5">
                  <div class="col-lg-6 col-md-6 col-sm-6">
                     Receipt No: <span id="receipt_no">
                       <% if @status_sale == 'sale' %>
@@ -142,7 +142,7 @@
                    <br>
                  </div>
                </div>
-                <div class="row">
+                <div class="row p-l-5 p-r-5">
                    <div class="col-lg-6 col-md-6 col-sm-6">
                  <% if @status_sale == 'sale' %>
                      <p class="hidden customer-id"><%= @sale_array[0].customer_id rescue '' %></p>
--- a/app/views/origami/movetable/move_dining.html.erb
+++ b/app/views/origami/movetable/move_dining.html.erb
@@ -220,17 +220,22 @@ $(document).ready(function(){
      var dining_id = $(this).attr("data-id");
      var change_from = "<%= @dining.id %>";
      if (dining_id == change_from) {
-        $.alert({
+        /*$.alert({
          title: 'Alert!',
          content: 'Please Select Another Table',
          type: 'red',
          typeAnimated: true,
          btnClass: 'btn-danger',
-        });
-      }else{
-        $('#moved').text(" ' " + dining_name + " ' ")
-        $('#change_table_value').val(dining_id);
-      }
+        });*/
+          swal({
+             title: "Alert!!",
+             text: 'Please Select Another Table !',
+             type: 'warning',
+          });
+        }else{
+          $('#moved').text(" ' " + dining_name + " ' ")
+          $('#change_table_value').val(dining_id);
+        }
     
  })

@@ -241,13 +246,11 @@ $(document).ready(function(){
    var dining_id = $(this).attr("data-id");
    var change_from = "<%= @dining.id %>";
    if (dining_id == change_from) {
-        $.alert({
-          title: 'Alert!',
-          content: 'Please Select Another Table',
-          type: 'red',
-          typeAnimated: true,
-          btnClass: 'btn-danger',
-        });
+        swal({
+             title: "Alert!!",
+             text: 'Please Select Another Table !',
+             type: 'warning',
+          });
      }else{
        $('#moved').text(dining_name)
        $('#change_table_value').val(dining_id);
@@ -258,18 +261,29 @@ $(document).ready(function(){
    change_to = $('#change_table_value').val();
    change_from = "<%= @dining.id %>";
    if (change_to == ""){
-      alert("Please Select Table")
+      swal({
+             title: "Alert!!",
+             text: 'Please Select Table !',
+             type: 'warning',
+          });
    }else{
      $.ajax({type: "POST",
        url: "<%= origami_moving_path %>",
        data: "change_from="+ change_from + "&change_to=" + change_to,
        success:function(result){
-          alert("Moving Success")
-          if (result.get_type == 'Table'){
-            window.location.href = '/origami/table/' + change_to;
-          }else{
-            window.location.href = '/origami/room/' + change_to;
-          }
+          
+          swal({
+             title: "Information!",
+             text: 'Moving Success',
+             type: 'success',
+          }, function (){
+             if (result.get_type == 'Table'){
+              window.location.href = '/origami/table/' + change_to;
+              }else{
+                window.location.href = '/origami/room/' + change_to;
+              }
+          });
+         
        }
      });
    }
--- a/app/views/origami/orders/show.html.erb
+++ b/app/views/origami/orders/show.html.erb
@@ -127,18 +127,18 @@
          <div><strong id="order-title">ORDERS DETAILS </strong></div>
       </div>
       <div class="card-block">
-         <div class="card-title row">
+         <div class="card-title row p-l-5 p-r-5">
           <div class="col-lg-6 col-md-6 col-sm-6">
-             <p> Receipt No: <span id="receipt_no">
-             </span></p>
+              Receipt No: <span id="receipt_no">
+             </span>
           </div>
           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             <p>Date:  <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+            Date:  <span id="receipt_date"><%= @order.created_at.utc.getlocal.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
           </div>
         </div>
         <div class="card-title row customer_detail hide">
           <div class="col-lg-6 col-md-6 col-sm-6">
-             <p>Customer : <span id="customer_name"></span></p>
+             Customer : <span id="customer_name"></span>
           </div>

         </div>
--- a/app/views/origami/rooms/show.html.erb
+++ b/app/views/origami/rooms/show.html.erb
@@ -130,27 +130,27 @@

       </div>
       <div class="card-block">
-         <div class="card-title row">
+         <div class="card-title row p-l-5 p-r-5">
           <div class="col-lg-6 col-md-6 col-sm-6">
-             <p> Receipt No: <span id="receipt_no">
+              Receipt No: <span id="receipt_no">
               <% if @status_sale == 'sale' %>
                 <%= @obj_sale.receipt_no rescue '' %>

               <% end %>
-             </span></p>
+             </span>
           </div>
           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             <p>Date:  <span id="receipt_date"><%= @obj_sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+            Date:  <span id="receipt_date"><%= @obj_sale.created_at.utc.getlocal.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
           </div>
         </div>
-         <div class="card-title row customer_detail">
+         <div class="card-title row customer_detail p-l-5 p-r-5">
           <div class="col-lg-6 col-md-6 col-sm-6">
             <% if @status_sale == 'sale' %>
              <p class="hidden customer-id"><%= @obj_sale_sale.customer_id rescue '' %></p>
-               <p>Customer : <%= @obj_sale_sale.customer.name rescue '-' %></p>
+               Customer : <%= @obj_sale_sale.customer.name rescue '-' %>
             <%else%>
               <p class="hidden customer-id"><%= @customer.customer_id rescue "" %></p>
-               <p>Customer : <%= @customer.name rescue "-" %></p>
+               Customer : <%= @customer.name rescue "-" %>
             <%end%>
           </div>

--- a/app/views/origami/sales/show.html.erb
+++ b/app/views/origami/sales/show.html.erb
@@ -112,20 +112,19 @@
          <div><strong id="order-title">INVOICE DETAILS </strong></div>
       </div>
       <div class="card-block">
-         <div class="card-title row">
+         <div class="card-title row p-l-5 p-r-5">
           <div class="col-lg-6 col-md-6 col-sm-6">
-             <p> Receipt No: <span id="receipt_no">
+              Receipt No: <span id="receipt_no">
                 <%= @sale.receipt_no rescue '' %>
-             </span></p>
+             </span>
           </div>
           <div class="col-lg-6 col-md-6 col-sm-6 text-right">
-             <p>Date:  <span id="receipt_date"><%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span></p>
+             Date:  <span id="receipt_date"><%= @sale.created_at.strftime("%d/%m/%Y - %I:%M %p") rescue '-'%></span>
           </div>
         </div>
-         <div class="card-title row customer_detail">
+         <div class="card-title row customer_detail p-l-5 p-r-5">
           <div class="col-lg-6 col-md-6 col-sm-6">
-             
-               <p>Customer : <%= @sale.customer.name rescue "-" %></p>
+             Customer : <%= @sale.customer.name rescue "-" %>

           </div>