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

app/controllers/settings/order_queue_stations_controller.rb

@@ -4,7 +4,8 @@ class Settings::OrderQueueStationsController < ApplicationController
   # GET /settings/order_queue_stations
   # GET /settings/order_queue_stations.json
   def index
-    @settings_order_queue_stations = OrderQueueStation.all.active
+    @settings_order_queue_stations = OrderQueueStation.all
+    @settings_order_queue_stations = Kaminari.paginate_array(@settings_order_queue_stations).page(params[:page]).per(50)
   end
 
   # GET /settings/order_queue_stations/1

app/controllers/transactions/sales_controller.rb

@@ -9,23 +9,30 @@ class Transactions::SalesController < ApplicationController
     receipt_no  = params[:receipt_no]
     today       = Date.today
     
-    if receipt_no.nil?
+    if receipt_no.nil? && search_date.nil?
-        sales = Sale.order("sale_id desc")
+         @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) 
+         @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
     else
-        order = Sale.search(receipt_no)
+        if !search_date.blank? && receipt_no.blank?  
-        if order.count > 0
+          sale = Sale.where("DATE_FORMAT(receipt_date,'%d-%m-%Y') = ? and NOT sale_status = 'void' ", search_date).order("sale_id desc").limit(500).page(params[:page])
-          sales = order 
+        elsif !search_date.blank? && !receipt_no.blank? 
+          sale = Sale.where("receipt_no LIKE ? or DATE_FORMAT(receipt_date,'%d-%m-%Y') = ? and NOT sale_status = 'void' ", "%#{receipt_no}%", search_date).order("sale_id desc").limit(500).page(params[:page])
         else  
-          sales = Sale.order("sale_id desc")
+          sale = Sale.where("receipt_no LIKE ? and NOT sale_status = 'void' ", receipt_no).order("sale_id desc").limit(500).page(params[:page]) 
-            
+        end  
+        if sale.count > 0
+          @sales = sale 
+          @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
+        else
+          @sales = 0
         end
     end
-    @sales = Kaminari.paginate_array(sales).page(params[:page]).per(50)
 
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @sales }
     end
+
   end
 
   # GET /transactions/sales/1
@@ -108,11 +115,10 @@ class Transactions::SalesController < ApplicationController
      sale_id           = params[:sale_id]
      reason            = params[:reason]
      sale              = Sale.find(sale_id)
-     sale.sales_status = 'void'
+     sale.sale_status  = 'void'
-     sale.remarks      = reason
+     sale.requested_by = current_login_employee.id
-     sale.void_by      = current_user.id
      if sale.save  
-       sale =SaleAudit.record_audit_void(sale_id, current_user.id, current_user.id, reason)
+       @sale = SaleAudit.record_audit_void(sale_id, current_login_employee.id, current_login_employee.id, reason)
      end
      respond_to do |format|
        format.html { redirect_to transactions_sales_url, notice: 'Sale was successfully void.' }

app/models/sale_audit.rb

@@ -6,7 +6,7 @@ class SaleAudit < ApplicationRecord
 
   belongs_to :sale
 
-  def record_audit_void(sale_id, void_by, approved_by, reason)
+  def self.record_audit_void(sale_id, void_by, approved_by, reason)
     #sale_audit
     sale_audit = SaleAudit.new()
     sale_audit.sale_id = sale_id

app/views/settings/order_queue_stations/index.html.erb

@@ -42,5 +42,5 @@
       <% end %>
     </tbody>
   </table>
-
+  <%= paginate @settings_order_queue_stations %>
 </div>

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

@@ -20,9 +20,9 @@
                  <td colspan="8">
                     <%= form_tag transactions_sales_path, :method => :get do %>
                       <div class="input-append form-group pull-right col-md-6">
-                        <!-- <input class="datepicker col-md-3 form-control" name="date" id="date" type="text" placeholder="Receipt date" style="margin-right: 10px"> -->
+                        <input class="datepicker col-md-3 form-control" name="date" id="date" type="text" placeholder="Receipt date" style="margin-right: 10px">
       
-                         <input type="text" name="receipt_no" class="col-md-6 form-control" placeholder="Receipt No" style="margin-right: 10px">
+                         <input type="text" name="receipt_no" class="col-md-5 form-control" placeholder="Receipt No" style="margin-right: 10px">
                         <button type="submit" class="btn btn-primary btn">Search</button>
                       </div>
                     <% end %>
@@ -41,8 +41,8 @@
             </thead>
 
             <tbody>
+              <% if @sales != 0 %>
                   <% @sales.each do |sale| %>
-
                     <tr>
                       <td><%= sale.sale_id %></td>
                       <td><%= sale.receipt_no %></td>
@@ -54,10 +54,15 @@
                       <td><%= link_to 'Show', transactions_sale_path(sale) %></td>
                     </tr>
                   <% end %>
+              <% else %>
+                    <tr><td colspan="8"><strong><p style="text-align: center">There is no data for search....</p></strong></td></tr>
+              <% end %>
             </tbody>
           </table>
           <br>
+           <% if @sales != 0 %>
                <%= paginate @sales %>
+           <% end %>
         </div>
       </div>
 

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

@@ -171,11 +171,11 @@
       </a>
       
       <!-- Temporary No Needs -->
-      <!--  <a href="<%= transactions_void_path(@sale)%>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
+       <a href="<%= transactions_void_path(@sale)%>" style="margin-top: 10px " class="btn btn-danger pull-right btn-lg">
 
         <i class="fa fa-trash fa-lg"></i>  Void Sale
        </a>
-      <a href="<%= %>" style="margin-top: 10px " class="btn btn-primary pull-right btn-lg">
+      <!-- <a href="<%= %>" style="margin-top: 10px " class="btn btn-success pull-right btn-lg">
         <i class="fa fa-invoice fa-lg"></i> Complete Sale
       </a> -->
     </div>

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

@@ -61,18 +61,16 @@
       var reason  = $('input[type="radio"]:checked').val();
       console.log(reason)
 
-      var url     = '<% transactions_manual_void_sale_path()%>';
+      var url     = 'manual_void_sale';alert(url)
       var sale_id = $(this).find(".customer-id").text();
         $.ajax({ 
          type: 'POST', 
-         url: 'sales/manual_void_sale', 
+         url: 'manual_void_sale', 
          data: {reason: reason, sale_id: sale_id}, 
          success: function(data){
-           window.location.href = "transactions/sales"
+           // window.location.href = "transactions/sales"
          } 
        }); 
-
-
   }); 
 
   });

config/routes.rb

@@ -199,7 +199,7 @@ Rails.application.routes.draw do
     resources :sales
     resources :orders
     get "/sales/:sale_id/void" =>"sales#void", :as => "void"
-    post "sales/manual_void_sale", to: "sales#manual_void_sale", :as => "manual_void_sale"
+    post "sales/:sale_id/manual_void_sale", to: "sales#manual_void_sale", :as => "manual_void_sale"
   end
 
   #--------- Reports Controller Sections ------------#