Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant

app/assets/javascripts/CRM.js

@@ -11,6 +11,7 @@
 // about supported directives.
 //
 //= require jquery
+//= require tether
 //= require bootstrap
 //= require jquery_ujs
 //= require turbolinks

app/controllers/origami/customers_controller.rb

@@ -28,10 +28,9 @@ class Origami::CustomersController < BaseOrigamiController
     @crm_customers   = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
     @crm_customer    = Customer.new
     
-    if flash["errors"]
+    # if flash["errors"]
-      @crm_customer.valid?
+    #   @crm_customer.valid?
-    end
+    # end
-  
   
     respond_to do |format|
       # format.html { render :template => "crm/customers/index" }

app/controllers/origami/request_bills_controller.rb

@@ -8,6 +8,8 @@ class Origami::RequestBillsController < BaseOrigamiController
     check_booking = Booking.find_by_booking_id(booking_id)
     if check_booking.sale_id.nil?
       # Create Sale if it doesn't exist
+      puts "current_login_employee"
+      puts current_login_employee.name
       @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee)
       @sale_data = Sale.find_by_sale_id(@sale_id)
       @sale_items = SaleItem.where("sale_id=?",@sale_id)
@@ -33,5 +35,3 @@ class Origami::RequestBillsController < BaseOrigamiController
     redirect_to origami_path(@sale_data.sale_id)
   end
 end
-
-

app/controllers/transactions/sales_controller.rb

@@ -104,7 +104,19 @@ class Transactions::SalesController < ApplicationController
   end
 
   def manual_void_sale
-     sale_id = params[:sale_id]
+
+     sale_id           = params[:sale_id]
+     reason            = params[:reason]
+     sale              = Sale.find(sale_id)
+     sale.sales_status = 'void'
+     sale.remarks      = reason
+     sale.void_by      = current_user.id
+     if sale.save  
+       sale =SaleAudit.record_audit_void(sale_id, current_user.id, current_user.id, reason)
+     end
+     respond_to do |format|
+       format.html { redirect_to transactions_sales_url, notice: 'Sale was successfully void.' }
+     end
      
   end
 

app/views/crm/customers/index.html.erb

@@ -44,6 +44,7 @@
             <tbody>
               <% if @crm_customers.count > 0  %> 
                  <% @crm_customers.each do |crm_customer| %>
+                  <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
                     <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
                      <td>
                      <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
@@ -54,6 +55,7 @@
                       <td><%= link_to 'Show', crm_customer_path(crm_customer) %></td>
                      
                     </tr>
+                    <% end %>
                   <% end %>
               <%else%>
                  <tr><td colspan="5"><p style="text-align:center"><strong>There are no record for your search</strong></p></td></tr>
@@ -101,13 +103,12 @@
 
     <div class="form-group">
     <label>Date Of Birth</label>
-     <%= f.text_field :date_of_birth,:class=>"form-control datepicker"%>
+     <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
    </div>
 
    <div class="form-group">
    <label>Select Member Group</label>
-        <select class="selectpicker form-control col-md-12" name="member_group_id" >
+        <select class="selectpicker form-control col-md-12" name="member_group_id"  style="height: 40px" >
-            <option>Select Member Group</option>
             <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
                <option value="<%= member.value %>">
               <%= member.name %></option>
@@ -120,6 +121,7 @@
   <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' %>
   </div>
  <%end%>
 </div>
@@ -229,5 +231,12 @@ $(function() {
       });
   }
 
+  $('#reset').click(function() {
+    
+    window.location.href = '/crm/customers'
+
+    return false;
+  });
+
 </script>
                   

app/views/origami/customers/index.html.erb

@@ -2,9 +2,9 @@
   <div class="col-lg-12">
     <ol class="breadcrumb">
        <li><a href="<%= crm_root_path %>">Home</a></li>
-       <li class="active">
+      <!--  <li class="active">
            <a href="<%= crm_customers_path %>">Customer</a>
-       </li>
+       </li> -->
        <!-- <a href="<%= new_crm_customer_path%>" class="btn btn-primary pull-right">
         <i class="fa fa-plus-circle fa-lg"></i> Add Customer
        </a> -->
@@ -45,6 +45,7 @@
             <tbody>
               <% if @crm_customers.count > 0  %> 
                  <% @crm_customers.each do |crm_customer| %>
+                 <% if crm_customer.customer_id != "CUS-000000000001" && crm_customer.customer_id != "CUS-000000000002" %> 
                      <tr class="customer_tr" data-ref="<%= crm_customer.customer_id %>">
                      <td>
                      <input type="radio" style="width:20px;" name="checkbox" class="checkbox_check" ></td>
@@ -55,6 +56,7 @@
                       
                      
                     </tr>
+                    <% end %>
                   <% end %>
               <%else%>
                  <tr><td colspan="5"><p style="text-align:center"><strong>There are no record for your search</strong></p></td></tr>
@@ -77,30 +79,39 @@
     <%= f.error_notification %>
     <%= f.hidden_field :id, :class => "form-control col-md-6 " %>
     
-    <div class="form-group">
+    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
       <%= f.input :name, :class => "form-control col-md-6 name" %>
+      <% flash.each do |name, msg| %>
+         <span class="help-block"><%= msg['name'] %></span>
+      <% end -%>
      
     </div>
     <div class="form-group">
       <%= f.input :company, :class => "form-control col-md-6 company" %>
     </div>
-    <div class="form-group">
+    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
       <%= f.input :contact_no, :class => "form-control col-md-6 contact_no" %>
+      <%  flash.each do |name, msg| %>
+         <span class="help-block"><%= msg['contact_no'] %></span>
+      <% end -%>
     </div>
 
-    <div class="form-group">
+    <div class="form-group <%= (flash["errors"]) ? "has-error" : "" %>">
       <%= f.input :email, :class => "form-control col-md-6 email" %>
+   
+      <% flash.each do |name, msg| %>
+         <span class="help-block"><%= msg['email'] %></span>
+      <% end -%>
     </div>
 
     <div class="form-group">
       <label>Date Of Birth</label>
-      <%= f.text_field :date_of_birth,:class=>"form-control datepicker"%>
+      <%= f.text_field :date_of_birth,:value=>"01-01-1990",:class=>"form-control datepicker"%>
     </div>
 
     <div class="form-group">
      <label>Select Member Group</label>
      <select class="selectpicker form-control col-md-12" name="member_group_id">
-      <option>Select Member Group</option>
       <%  Lookup.where("lookup_type = ?", "member_group_type" ).each do |member| %>
       <option value="<%= member.value %>">
         <%= member.name %></option>
@@ -127,9 +138,10 @@
 <script type="text/javascript">
   $(function() {
     $('.datepicker').datepicker({
-     format : 'dd-mm-yyyy',
+       setDate: '12-12-1999',
-     autoclose: true
+       format : 'dd-mm-yyyy',
-   });
+       autoclose: true
+    });
     $('.datepicker').attr('ReadOnly','true');
     $('.datepicker').css('cursor','pointer');
   });

app/views/origami/payments/show.html.erb

@@ -237,12 +237,16 @@
     <!-- Waiter Buttons -->
     <button type="button" class="btn btn-primary btn-lg btn-block"> Foc </button>
     <button type="button" class="btn btn-primary btn-lg btn-block"> Void </button>
-    <button type="button" class="btn btn-primary btn-lg btn-block" onclick="window.location.href = '/origami';"> Back </button>
+    <button type="button" class="btn btn-primary btn-lg btn-block" onclick="localStorage.removeItem('cash');window.location.href = '/origami';"> Back </button>
   </div>
   </div>
 
 <script>
 $(document).ready(function(){
+  if(localStorage.getItem("cash") == null || localStorage.getItem("cash") == 'null'){}
+  else {
+    $('#cash').text(localStorage.getItem("cash"));
+  }
   update_balance();
 })
 
@@ -283,7 +287,16 @@ $(document).on('click', '.cashier_number', function(event){
            update_balance();
         break;
         case 'nett':
-          $('#cash').text($('#amount_due').text());
+          var credit1 = $('#credit').text();
+          var card1 = $('#others').text();
+          var paypar1 = $('#ppamount').text();
+          var visa1 = $('#visacount').text();
+          var jcb1 = $('#jcbcount').text();
+          var master1 = $('#mastercount').text();
+          var othertotal = parseFloat(credit1) + parseFloat(card1) + parseFloat(paypar1) + parseFloat(visa1) + parseFloat(jcb1) + parseFloat(master1);
+          var total = $('#amount_due').text();
+          var amt = parseFloat(total) - othertotal;
+          $('#cash').text(amt);
           update_balance();
         break;
     }
@@ -301,6 +314,7 @@ $( document ).ready(function() {
  });
 
  $('#card_payment').click(function() {
+   localStorage.setItem("cash",$('#cash').text() );
    var sale_id = $('#sale_id').text();
     window.location.href = '/origami/sale/'+ sale_id  + "/payment/others_payment"
     return false;
@@ -315,10 +329,12 @@ $( document ).ready(function() {
       var credit = $('#credit').text();
       var card = $('#card').text();
       var sale_id = $('#sale_id').text();
+
       $.ajax({type: "POST",
         url: "<%= origami_payment_cash_path %>",
         data: "cash="+ cash + "&sale_id=" + sale_id,
         success:function(result){
+          localStorage.removeItem("cash");
           if($('#balance').text() < 0){
             alert("Changed amount  " + $('#balance').text() * (-1) )
           }else{

app/views/transactions/sales/show.html.erb

@@ -51,7 +51,7 @@
                           <tr>
                             <td><%= @sale.receipt_date.strftime("%d-%M-%Y") %></td>
                             <td><%= @sale.receipt_no %></td>
-                            <td><%= @sale.cashier rescue '-' %></td>
+                            <td><%= @sale.cashier_name rescue '-' %></td>
                             <td> <%= @sale.sale_status %> </td>
                             <td> <%= @sale.requested_at.strftime("%d-%m-%Y") %> </td>
                           </tr> 
@@ -175,7 +175,7 @@
 
         <i class="fa fa-trash fa-lg"></i>  Void Sale
        </a>
-      <a href="<%= transactions_manual_void_sale_path(@sale)%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
+      <a href="<%= %>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
         <i class="fa fa-invoice fa-lg"></i> Complete Sale
       </a> -->
     </div>

app/views/transactions/sales/showback.html.erb

@@ -1,89 +0,0 @@
-<p id="notice"><%= notice %></p>
-
-<p>
-  <strong>Cashier:</strong>
-  <%= @transactions_sale.cashier %>
-</p>
-
-<p>
-  <strong>Cashier name:</strong>
-  <%= @transactions_sale.cashier_name %>
-</p>
-
-<p>
-  <strong>Requested by:</strong>
-  <%= @transactions_sale.requested_by %>
-</p>
-
-<p>
-  <strong>Requested at:</strong>
-  <%= @transactions_sale.requested_at %>
-</p>
-
-<p>
-  <strong>Receipt no:</strong>
-  <%= @transactions_sale.receipt_no %>
-</p>
-
-<p>
-  <strong>Receipt date:</strong>
-  <%= @transactions_sale.receipt_date %>
-</p>
-
-<p>
-  <strong>Customer:</strong>
-  <%= @transactions_sale.customer %>
-</p>
-
-<p>
-  <strong>Payment status:</strong>
-  <%= @transactions_sale.payment_status %>
-</p>
-
-<p>
-  <strong>Sale status:</strong>
-  <%= @transactions_sale.sale_status %>
-</p>
-
-<p>
-  <strong>Total amount:</strong>
-  <%= @transactions_sale.total_amount %>
-</p>
-
-<p>
-  <strong>Total discount:</strong>
-  <%= @transactions_sale.total_discount %>
-</p>
-
-<p>
-  <strong>Total tax:</strong>
-  <%= @transactions_sale.total_tax %>
-</p>
-
-<p>
-  <strong>Tax type:</strong>
-  <%= @transactions_sale.tax_type %>
-</p>
-
-<p>
-  <strong>Grand total:</strong>
-  <%= @transactions_sale.grand_total %>
-</p>
-
-<p>
-  <strong>Rounding adjustment:</strong>
-  <%= @transactions_sale.rounding_adjustment %>
-</p>
-
-<p>
-  <strong>Amount received:</strong>
-  <%= @transactions_sale.amount_received %>
-</p>
-
-<p>
-  <strong>Amount changed:</strong>
-  <%= @transactions_sale.amount_changed %>
-</p>
-
-<%= link_to 'Edit', edit_transactions_sale_path(@transactions_sale) %> |
-<%= link_to 'Back', transactions_sales_path %>

app/views/transactions/sales/void.html.erb

@@ -15,12 +15,16 @@
 
   <div class="col-lg-10 col-md-10 col-sm-10">
     <div class="tab-pane active" id="queue" role="tabpanel" style="min-height:670px; max-height:670px; overflow-y:">
-       <h3>Choose your reason</h3>
+      <h3>Choose Reason For Void</h3>
-       <table>
+      <br>
+      <p class="hidden sale-id"><%= @sale  %></p>
+      <table class="table table-striped">
         <% @reason.each do |r| %>
-        <tr>
+        <tr class="customer_tr">
+          <td></td>
           <td>
-            <%= check_box_tag "reason", "#{r.name}" rescue '-' %>
+            <input type="radio" style="width:20px;" name="reason" value="<%=r.name%>" class="checkbox_check" >
+            <!--  <%= check_box_tag "reason", "#{r.name}",:class => 'checkbox_check' rescue '-'  %> -->
           </td>
 
           <td><%= label_tag "reasons[#{r.id}]", r.name, :style=>'font-weight:bold;font-size:18px;' rescue '-' %></td>
@@ -29,10 +33,13 @@
       </table>
     </div>
   </div>
-<div class="col-lg-2 col-md-2 col-sm-2">
+  <div class="col-lg-2 col-md-2 col-sm-2">
-    <a href="<%= transactions_sale_path(@sale)%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg"><i class="fa fa-arrow-left fa-lg"></i> Back
+    <br><br><br>
+    <a href="<%= transactions_sale_path(@sale)%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg"><i class="fa fa-arrow-left fa-lg"></i> Cancel
     </a>
-</div>
+    <button type="button" style="margin-top: 10px " class="btn btn-danger pull-right btn-lg" id="void" disabled><i class="fa fa-trash fa-lg"></i> Void
+    </button>
+  </div>
 
 </div>
 <style>
@@ -42,6 +49,35 @@
  }
 </style>
 
+<script>
+  $(function() { 
+      $(document).on('click',".customer_tr",function(){
+        $(this).closest('tr').find('.checkbox_check').prop( "checked", true );
+        $('#void').removeAttr('disabled')
+      });
+
+  $("#void").click(function() {
+
+      var reason  = $('input[type="radio"]:checked').val();
+      console.log(reason)
+
+      var url     = '<% transactions_manual_void_sale_path()%>';
+      var sale_id = $(this).find(".customer-id").text();
+        $.ajax({ 
+         type: 'POST', 
+         url: 'sales/manual_void_sale', 
+         data: {reason: reason, sale_id: sale_id}, 
+         success: function(data){
+           window.location.href = "transactions/sales"
+         } 
+       }); 
+
+
+  }); 
+
+  });
+</script>
+
 
 
 

config/puma.rb.production

@@ -0,0 +1,9 @@
+application_path = '/home/superuser/Application/production/sxrestaurant'
+directory application_path
+environment 'production'
+daemonize true
+pidfile "#{application_path}/tmp/pids/puma.pid"
+state_path "#{application_path}/tmp/pids/puma.state"
+stdout_redirect "#{application_path}/log/puma.stdout.log", "#{application_path}/log/puma.stderr.log"
+bind 'tcp://0.0.0.0:9292'
+workers 2