vyapari 0.1.5dev9 → 0.1.5dev10

data/app/models/supplier.rb

@@ -2,14 +2,15 @@ class Supplier < Vyapari::ApplicationRecord
 
   # Validations
   validates :name, presence: true, length: {minimum: 2, maximum: 250}, allow_blank: false
-  validates :code, presence: true, uniqueness: true, length: {minimum: 2, maximum: 24}, allow_blank: false
-  validates :address, presence: true, length: {minimum: 3, maximum: 1024}, allow_blank: true
-  validates :city, presence: true, length: {minimum: 2, maximum: 56}, allow_blank: true
+  validates :code, presence: true, uniqueness: true, length: {minimum: 2, maximum: 24}
+  validates :address, length: {minimum: 6, maximum: 1024}
+  validates :city, length: {minimum: 2, maximum: 56}
   validates :country, presence: true
   
   # Associations
   belongs_to :country
-  has_many :products
+  has_many :stock_entries
+  has_many :products, through: :stock_entries
   
   # ------------------
   # Class Methods
@@ -20,12 +21,15 @@ class Supplier < Vyapari::ApplicationRecord
   # == Examples
   #   >>> obj.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| joins(:country).where("LOWER(name) LIKE LOWER('%#{query}%') OR 
-                                                        LOWER(code) LIKE LOWER('%#{query}%') OR 
-                                                        LOWER(address) LIKE LOWER('%#{query}%') OR 
-                                                        LOWER(city) LIKE LOWER('%#{query}%')")}
+  scope :search, lambda {|query| joins(:country).where("LOWER(suppliers.name) LIKE LOWER('%#{query}%') OR 
+                                                        LOWER(suppliers.code) LIKE LOWER('%#{query}%') OR 
+                                                        LOWER(suppliers.address) LIKE LOWER('%#{query}%') OR 
+                                                        LOWER(suppliers.city) LIKE LOWER('%#{query}%') OR 
+                                                        LOWER(countries.name) LIKE LOWER('%#{query}%')")}
+
+  # Import Methods
+  # ---------------
 
-  
   def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }
@@ -58,7 +62,7 @@ class Supplier < Vyapari::ApplicationRecord
   # ------------------
 
   def display_name
-    self.country ? "#{self.code_was}-#{self.name_was}, #{self.country.name}" : "#{self.code_was}-#{self.name_was}"
+    "#{self.code_was}-#{self.name_was}"
   end
 
   def can_be_edited?
@@ -66,20 +70,10 @@ class Supplier < Vyapari::ApplicationRecord
   end
 
   def can_be_deleted?
-    # if self.products.any?
-    #   #self.errors.add(:base, DELETE_MESSAGE) 
-    #   return false
-    # else
-    #   return true
-    # end
-    return true
-  end
-
-  def report_heading
-    rh = []
-    rh << self.company.try(:name) if self.company.name
-    rh << self.display_name
-    rh.join(", ")
+    if self.stock_entries.any?
+      return false
+    else
+      return true
+    end
   end
-
 end

data/app/models/terminal.rb

@@ -5,13 +5,13 @@ class Terminal < Vyapari::ApplicationRecord
   INACTIVE = "inactive"
   CLOSED = "closed"
   
-  STATUS_HASH = {"Active" => ACTIVE, "Inactive" => INACTIVE, "Closed" => CLOSED}
-  STATUS_HASH_REVERSE = {ACTIVE => "Active", INACTIVE => "Inactive", CLOSED => "Closed"}
+  STATUS = {"Active" => ACTIVE, "Inactive" => INACTIVE, "Closed" => CLOSED}
+  STATUS_REVERSE = {ACTIVE => "Active", INACTIVE => "Inactive", CLOSED => "Closed"}
 
   # Validations
   validates :name, presence: true, length: {minimum: 2, maximum: 250}, allow_blank: false
   validates :code, presence: true, uniqueness: true, length: {minimum: 2, maximum: 24}, allow_blank: false
-  validates :status, :presence=> true, :inclusion => {:in => STATUS_HASH_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
+  validates :status, :presence=> true, :inclusion => {:in => STATUS_REVERSE.keys, :presence_of => :status, :message => "%{value} is not a valid status" }
   
   # Associations
   belongs_to :store

data/app/models/vyapari/application_record.rb

@@ -2,9 +2,8 @@ module Vyapari
   class ApplicationRecord < ActiveRecord::Base
 	  self.abstract_class = true
 
-	  require 'kuppayam/importer.rb'
 	  extend Kuppayam::Importer
-	  extend KuppayamValidators
+	  extend Kuppayam::Validators
 	end
 end
 

data/app/views/layouts/vyapari/_store_manager_menu.html.erb

@@ -5,8 +5,8 @@
     <!-- Navbar Brand -->
     <div class="navbar-brand">
       <a href="dashboard-1.html" class="logo">
-        <img src="/assets/kuppayam/logo.png" width="80" alt="" class="hidden-xs" />
-        <img src="/assets/kuppayam/logo.png" width="80" alt="" class="visible-xs" />
+        <img src="/assets/kuppayam/logo.png" width="180" alt="" class="hidden-xs" />
+        <img src="/assets/kuppayam/logo.png" width="180" alt="" class="visible-xs" />
       </a>
       <a href="#" data-toggle="settings-pane" data-animate="true">
         <i class="linecons-cog"></i>
@@ -43,9 +43,28 @@
       </li>
 
       <li class="<%= nav_active?('store_manager/stock') ? 'active' : ''  %>">
-        <%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Manage Stock</span>"), vyapari.store_manager_stock_entries_path(@store) %>
+        <%= link_to raw("<i class=\"fa-truck\"></i> <span class='title'>Manage Stock</span>"), vyapari.store_manager_stock_entries_path(@store) %>
       </li>
 
+      <!-- Reports -->
+      <li class="<%= nav_active?('store_manager/reports') ? 'active' : ''  %>">
+        <a href="#">
+          <i class="fa-list"></i>
+          <span class="title">Reports</span>
+        </a>
+        <ul>
+          <li>
+            <%= link_to raw("<i class=\"fa-shopping-cart\"></i> <span class='title'>Sales Report</span>"), vyapari.store_manager_sales_report_path(@store) %>
+          </li>
+          <li>
+            <%= link_to raw("<i class=\"fa-book\"></i> <span class='title'>Invoice Report</span>"), vyapari.store_manager_invoices_report_path(@store) %>
+          </li>
+          <!-- <li>
+            <%#= link_to raw("<i class=\"fa-truck\"></i> <span class='title'>Stock Report</span>"), vyapari.store_manager_stock_report_path(@store) %>
+          </li> -->
+        </ul>
+      </li>
+      
       <!-- Admin -->
       <% if @current_user.has_role?("Site Admin") %>
       <li class="<%= nav_active?('admin/dashboard') ? 'active' : ''  %>">
@@ -53,9 +72,9 @@
       </li>
       <% end %>
 
-      <!-- Log out -->
+      <!-- Change Store -->
       <li class="<%= nav_class("user/dashboard") %>">
-        <%= link_to raw("<i class=\"fa-desktop\"></i> <span class='title'>Change Store/Terminal</span>"), vyapari.user_dashboard_path %>
+        <%= link_to raw("<i class=\"fa-desktop\"></i> <span class='title'>Change Store</span>"), vyapari.user_dashboard_path %>
       </li>
 
       

data/app/views/layouts/vyapari/_terminal_staff_menu.html.erb

@@ -5,8 +5,8 @@
     <!-- Navbar Brand -->
     <div class="navbar-brand">
       <a href="dashboard-1.html" class="logo">
-        <img src="/assets/kuppayam/logo.png" width="80" alt="" class="hidden-xs" />
-        <img src="/assets/kuppayam/logo.png" width="80" alt="" class="visible-xs" />
+        <img src="/assets/kuppayam/logo.png" width="180" alt="" class="hidden-xs" />
+        <img src="/assets/kuppayam/logo.png" width="180" alt="" class="visible-xs" />
       </a>
       <a href="#" data-toggle="settings-pane" data-animate="true">
         <i class="linecons-cog"></i>
@@ -42,18 +42,21 @@
 
       <%= nav_class("terminal_staff/invoices") %>
 
+      <!-- Manage Invoices -->
       <li class="<%= nav_class("terminal_staff/invoices") %>">
         <%= link_to raw("<i class=\"fa-book\"></i> <span class='title'>Invoices</span>"), vyapari.terminal_staff_invoices_path(@terminal) %>
       </li>
 
+      <!-- Admin -->
       <% if @current_user.has_role?("Site Admin") %>
       <li class="<%= nav_active?('admin/dashboard') ? 'active' : ''  %>">
         <%= link_to raw("<i class=\"linecons-desktop\"></i> <span class='title'>Admin Dashboard</span>"), vyapari.admin_dashboard_url %>
       </li>
       <% end %>
 
+      <!-- Change Terminal -->
       <li class="<%= nav_class("user/dashboard") %>">
-        <%= link_to raw("<i class=\"fa-desktop\"></i> <span class='title'>Change Store/Terminal</span>"), vyapari.user_dashboard_path %>
+        <%= link_to raw("<i class=\"fa-desktop\"></i> <span class='title'>Change Terminal</span>"), vyapari.user_dashboard_path %>
       </li>
 
     </ul>

data/app/views/layouts/vyapari/store_manager.html.erb

@@ -2,19 +2,19 @@
 <html lang="en">
   <head>
     <!-- Head -->
-    <%= render :partial=>"/layouts/kuppayam/head" -%>
+    <%= render :partial=>"layouts/kuppayam/head" -%>
   </head>
 
   <body class="page-body">
 
-    <%= render :partial=>"/layouts/vyapari/store_manager_menu" -%>
+    <%= render :partial=>"layouts/vyapari/store_manager_menu" -%>
 
     <div class="page-container">
       
       <div class="main-content">
 
         <!-- Heading & Breadcrumbs -->
-        <%= render :partial=>"/layouts/kuppayam/heading" -%>
+        <%= render :partial=>"layouts/kuppayam/heading" -%>
 
         <%#* Show flash messages if controller has set any. -%>
         <div id="div_flash_message" class="mt-10">
@@ -27,7 +27,7 @@
         </div>
 
         <!-- Footer -->
-        <%= render :partial=>"/layouts/kuppayam/footer" -%>
+        <%= render :partial=>"layouts/kuppayam/footer" -%>
 
       </div>
 

data/app/views/vyapari/store_manager/dashboard/_sales_counts.html.erb

@@ -0,0 +1,90 @@
+<%
+
+	total_invoice_amount = @store.invoices.dated(@date).active.sum(:net_total_amount) 
+
+	total_invoices = @store.invoices.dated(@date).active.count
+	
+	total_cash = @store.invoices.dated(@date).active.cash_invoices.sum(:net_total_amount)
+
+	total_cash_invoices = @store.invoices.dated(@date).active.where(payment_method: :cash).count
+
+	total_credit = @store.invoices.dated(@date).active.credit_card_invoices.sum(:net_total_amount)
+
+	total_credit_card_invoices = @store.invoices.dated(@date).active.where(payment_method: :credit_card).count
+
+%>
+
+<div class="row">
+	
+	<div class="col-sm-3">
+					
+		<div class="xe-widget xe-counter-block xe-counter-block-green" data-suffix="k" data-count=".num" data-from="0" data-to="310" data-duration="4" data-easing="false">
+			<div class="xe-upper">
+				
+				<div class="xe-icon">
+					<i class="fa-money"></i>
+				</div>
+				<div class="xe-label">
+					<strong class="num"><%= number_to_currency total_invoice_amount, unit: "AED " %></strong>
+					<span>Total Sales Today</span>
+				</div>
+				
+			</div>
+			<div class="xe-lower">
+				<div class="border"></div>
+				
+				<span>Total Invoices Today: <b><%= total_invoices %></b></span>
+			</div>
+		</div>
+	</div>
+
+	<div class="col-sm-3">
+					
+		<div class="xe-widget xe-counter-block xe-counter-block-white" data-suffix="k" data-count=".num" data-from="0" data-to="310" data-duration="4" data-easing="false">
+			<div class="xe-upper">
+				
+				<div class="xe-icon">
+					<i class="fa-money"></i>
+				</div>
+				<div class="xe-label">
+					<strong class="num"><%= number_to_currency total_cash, unit: "AED " %></strong>
+					<span>Total Cash Sales Today</span>
+				</div>
+				
+			</div>
+			<div class="xe-lower">
+				<div class="border"></div>
+				
+				<span>Total Cash Invoices Today: <b><%= total_cash_invoices %></b></span>
+				
+			</div>
+		</div>
+	</div>
+
+	<div class="col-sm-3">
+					
+		<div class="xe-widget xe-counter-block xe-counter-block-white" data-suffix="k" data-count=".num" data-from="0" data-to="310" data-duration="4" data-easing="false">
+			<div class="xe-upper">
+				
+				<div class="xe-icon">
+					<i class="fa-credit-card"></i>
+				</div>
+				<div class="xe-label">
+					<strong class="num"><%= number_to_currency total_credit, unit: "AED " %></strong>
+					<span>Total Credit Card Sales Today</span>
+				</div>
+			</div>
+			<div class="xe-lower">
+				<div class="border"></div>
+				<span>Total Credit Card Invoices Today: <b><%= total_credit_card_invoices %></b></span>
+			</div>
+		</div>
+	</div>
+
+	<div class="col-sm-3">
+		<%#= link_to raw("<i class=\"fa-book mr-10\"></i> Create Invoice"), new_terminal_staff_invoice_path(@terminal), remote: true, class: "btn btn-success btn-lg btn-block hidden-xs", style: "height:50px" %>
+
+		<%#= link_to raw("<i class=\"fa-book mr-10\"></i> Manage Invoices"), terminal_staff_invoices_path(@terminal), class: "btn btn-primary btn-only-hover btn-lg btn-block", style: "height:50px", target: "_blank" %>
+	</div>
+
+</div>

data/app/views/vyapari/store_manager/dashboard/_stock_counts.html.erb

@@ -0,0 +1,63 @@
+<div class="row">
+
+	<div class="col-sm-3">
+		<div class="xe-widget xe-counter xe-counter-info" data-count=".num" data-from="1" data-to="117" data-suffix="k" data-duration="3" data-easing="false">
+			<div class="xe-icon">
+				<i class="fa-truck"></i>
+			</div>
+			<div class="xe-label">
+				<strong class="num"><%= @store.total_quantity_of_products_in_stock %></strong>
+				<span>TOTAL QUANTITY IN STOCK</span>
+			</div>
+		</div>
+	</div>
+
+	<div class="col-sm-3">
+		<div class="xe-widget xe-counter xe-counter-gray" data-count=".num" data-from="1000" data-to="2470" data-duration="4" data-easing="true">
+			<div class="xe-icon">
+				<i class="fa-bookmark"></i>
+			</div>
+			<div class="xe-label">
+				<strong class="num"><%= @store.total_no_of_products_in_stock %></strong>
+				<span>TOTAL NO OF PRODUCTS</span>
+			</div>
+		</div>
+	</div>
+
+	<div class="col-sm-3">
+		<div class="xe-widget xe-counter xe-counter-success" data-count=".num" data-from="0" data-to="99.9" data-suffix="%" data-duration="2">
+				<div class="xe-icon">
+					<i class="fa-shopping-cart"></i>
+				</div>
+				<div class="xe-label">
+				<strong class="num"><%= @store.sold_items_count(@date) %></strong>
+					<span>ITEMS SOLD TODAY</span>
+				</div>
+			</div>
+	</div>
+
+	<!-- <div class="col-sm-3">
+		<div class="xe-widget xe-counter xe-counter-danger" data-count=".num" data-from="1000" data-to="2470" data-duration="4" data-easing="true">
+			<div class="xe-icon">
+				<i class="fa-ban"></i>
+			</div>
+			<div class="xe-label">
+				<strong class="num"><%#= @store.damaged_items_count(@date) %></strong>
+				<span>ITEMS DAMAGED TODAY</span>
+			</div>
+		</div>
+	</div>
+
+	<div class="col-sm-3">
+		<div class="xe-widget xe-counter xe-counter-gray" data-count=".num" data-from="1000" data-to="2470" data-duration="4" data-easing="true">
+			<div class="xe-icon">
+				<i class="fa-bookmark"></i>
+			</div>
+			<div class="xe-label">
+				<strong class="num"><%#= @store.reserved_items_count(@date) %></strong>
+				<span>RESERVED</span>
+			</div>
+		</div>
+	</div> -->
+
+</div>

data/app/views/vyapari/store_manager/dashboard/_terminals.html.erb

@@ -0,0 +1,23 @@
+
+
+<div class="row">
+
+	<% @store.terminals.each do |terminal| %>
+	<div class="col-sm-3">
+						
+		<div class="xe-widget xe-vertical-counter xe-vertical-counter-primary" data-count=".num" data-from="0" data-to="442" data-suffix=" TB" data-duration="5">
+			<div class="xe-icon">
+				<i class="fa-desktop"></i>
+			</div>
+			
+			<div class="xe-label">
+				<strong class="num"><%= terminal.code %></strong>
+				<span><%= terminal.name %></span>
+				<span><%= link_to "Log In", terminal_staff_dashboard_path(terminal), class: "btn btn-primary btn-white btn-block mt-20" %></span>
+			</div>
+		</div>
+		
+	</div>
+	<% end %>
+
+</div>

data/app/views/vyapari/store_manager/dashboard/index.html.erb

@@ -1,92 +1,64 @@
-<%
-	#total_no_of_products_in_stock = @store.stock_entries.active.count
-	#in_stock_count = @store.stock_entries.in_stock.count
-	#damaged_count = @store.stock_entries.damaged.count
-	#reserved_count = @store.stock_entries.reserved.count
-%>
-
-<div class="chart-item-bg-2">
-	<div class="chart-item-num" data-count="this" data-from="0" data-to="98" data-suffix="%" data-duration="2">
-		<i class="fa-truck"></i>
-		<%= @store.total_no_of_products_in_stock %> <span style="font-size:20px">Products</span>
-	</div>
-	<div class="chart-item-desc">
-		<%= link_to raw("<i class=\"fa-truck mr-10\"></i> View Stock"), store_manager_stock_entries_path(@store), class: "btn btn-success btn-lg btn-block", style: "height:50px" %>
-		<%= link_to raw("<i class=\"fa-upload mr-10\"></i> Import Stock"), store_manager_stock_bundles_path(@store), class: "btn btn-success btn-lg btn-block", style: "height:50px" %>
+<div class="row calendar-env">
+	<div class="col-md-12 text-center">
+		<div class="btn-group" style="margin:auto;">
+			
+			<%= link_to raw("<i class=\"fa fa-arrow-left\"></i>"), store_manager_dashboard_path(@store, date: (@date - 1.day)), class: "btn btn-white", style: "font-size: 20px;" %>
+			
+			<input type="text" name="reportdate" value="<%= @date.strftime("%m-%d-%Y") %>" class="btn btn-white" style="height:42px;" />
+			
+			<%= link_to raw("<i class=\"fa fa-arrow-right\"></i>"), store_manager_dashboard_path(@store, date: (@date + 1.day)), class: "btn btn-white", style: "font-size: 20px;" %>
+		</div>
 	</div>
 </div>
 
-<div class="row">
-	<div class="col-sm-3">
-
-		<div class="xe-widget xe-counter xe-counter-info" data-count=".num" data-from="1" data-to="117" data-suffix="k" data-duration="3" data-easing="false">
-			<div class="xe-icon">
-				<i class="fa-truck"></i>
-			</div>
-			<div class="xe-label">
-				<strong class="num"><%= @store.in_stock_items_count_as_of_now %></strong>
-				<span>TOTAL QUANTITY IN STOCK</span>
-			</div>
-		</div>
+<script type="text/javascript">
+	$(function() {
+	  
+	  $('input[name="reportdate"]').daterangepicker({
+	    singleDatePicker: true,
+	    showDropdowns: true
+	  },
 
-		<div class="xe-widget xe-counter xe-counter-success" data-count=".num" data-from="0" data-to="99.9" data-suffix="%" data-duration="2">
-			<div class="xe-icon">
-				<i class="fa-shopping-cart"></i>
-			</div>
-			<div class="xe-label">
-			<strong class="num"><%= @store.sold_items_count_for_today %></strong>
-				<span>ITEMS SOLD TODAY</span>
-			</div>
-		</div>
+	  function(start, end, label) {
+	  	var urlWithoutParams = location.protocol + '//' + location.host + location.pathname;
+	  	var params = { locale:'en', date:start.format('DD-MM-YYYY') };
+			var dateParam = jQuery.param(params);
+			window.location.href = urlWithoutParams + "?" + dateParam;
+	  });
+	});
+</script>
 
-		<div class="xe-widget xe-counter xe-counter-danger" data-count=".num" data-from="1000" data-to="2470" data-duration="4" data-easing="true">
-			<div class="xe-icon">
-				<i class="fa-ban"></i>
-			</div>
-			<div class="xe-label">
-				<strong class="num"><%= @store.damaged_items_count_for_today %></strong>
-				<span>ITEMS DAMAGED TODAY</span>
-			</div>
-		</div>
+<div class="row mt-40 mb-40">
+	<div class="col-sm-12">
+		<h3>Sales Summary</h3>
+	</div>	
+</div>
 
-		<div class="xe-widget xe-counter xe-counter-gray" data-count=".num" data-from="1000" data-to="2470" data-duration="4" data-easing="true">
-			<div class="xe-icon">
-				<i class="fa-bookmark"></i>
-			</div>
-			<div class="xe-label">
-				<strong class="num"><%= @store.reserved_items_count_for_today %></strong>
-				<span>RESERVED</span>
-			</div>
-		</div>
+<div id="div_store_dashboard_sales_counts">
+	<%= render :partial=>"vyapari/store_manager/dashboard/sales_counts" -%>
+</div>
 
+<div class="row mt-40 mb-40">
+	<div class="col-sm-6">
+		<h3>Stock Summary</h3>
+	</div>	
+	<div class="col-sm-6">
+		<%= link_to raw("<i class=\"fa-truck mr-10\"></i> View Stock"), store_manager_stock_entries_path(@store), class: "btn btn-primary pull-right ml-10 mt-20" %>
+		<%= link_to raw("<i class=\"fa-upload mr-10\"></i> Import Stock"), store_manager_stock_bundles_path(@store), class: "btn btn-secondary pull-right mt-20" %>
 	</div>
+</div>
 
-	<div class="col-sm-9">
 
-		<div class="panel panel-default" style="width:100%;min-height:405px;">
-			<div class="panel-heading">Terminals</div>
-			<table class="table">
-				<thead>
-					<tr>
-						<th style="width:60%">Name</th>
-						<th>Code</th>
-						<th style="text-align:center">Actions</th>
-					</tr>
-				</thead>
-				<tbody>
-					<% @store.terminals.each do |terminal| %>
-						<tr>
-							<td><%= terminal.name %></td>
-							<td><%= terminal.code %></td>
-							<td style="text-align:center">
-								<%= link_to "Log In", terminal_staff_dashboard_path(terminal), class: "btn btn-primary btn-success pr-30 pl-30" %>
-							</td>
-						</tr>
-					<% end %>
-				</tbody>
-			</table>
-		</div>
+<div id="div_store_dashboard_stock_counts">
+	<%= render :partial=>"vyapari/store_manager/dashboard/stock_counts" -%>
+</div>
 
+<div class="row mt-40 mb-40">
+	<div class="col-sm-12">
+		<h3>Terminals</h3>
 	</div>
-	
+</div>
+
+<div id="div_store_dashboard_terminals" class="mb-100">
+	<%= render :partial=>"vyapari/store_manager/dashboard/terminals" -%>
 </div>

data/app/views/vyapari/store_manager/reports/invoices/_index.html.erb

@@ -0,0 +1,65 @@
+<div class="table-responsive table-scrollable">
+	<table class="table table-striped table-condensed table-bordered"> 
+		<thead>
+			<tr> 
+				<% @columns.each do |col_item| %>
+					<% next unless @selected_columns.include?(col_item[:column_name]) %>
+						<th style="text-align: center;"><%= col_item[:display_name] %></th>
+				<% end %>
+			</tr>
+		</thead>
+		<tbody> 
+
+			<% cols_except_id = @columns.reject{|item| item[:column_name] == :id}.select{|item| @selected_columns.include?(item[:column_name]) } %>
+
+			<% @results.each_with_index do |result, i| %>
+				<tr> 
+					<th scope="row" style="text-align: center;"><%= i + 1 %></th>
+					
+					<% cols_except_id.each do |col_item| %>
+
+						<% case col_item[:column_type] %>
+						<% when :string, :integer %>
+							<td style="text-align: <%= col_item[:align] %>;">
+								<%= result.send(col_item[:column_name]) %>
+							</td>
+						<% when :status %>
+							<td style="text-align: <%= col_item[:align] %>;">
+								<%= result.send(col_item[:column_name]).titleize %>
+							</td>
+						<% when :currency %>
+							<td style="text-align: <%= col_item[:align] %>;">
+								<%= number_to_currency(result.send(col_item[:column_name]), unit: "") %>
+							</td>
+						<% when :date %>
+							<td style="text-align: <%= col_item[:align] %>;"><%= result.send(col_item[:column_name]).strftime("%d-%m-%Y") %>
+							</td>
+						<% else %>
+							<td style="text-align: <%= col_item[:align] %>;"><%= result.send(col_item[:column_name]) %>
+							</td>
+						<% end %>
+
+					<% end %>
+
+				</tr>
+			<% end %>
+			
+		</tbody> 
+
+		<tfoot> 
+			<% if @total && @total.first && @total.first.net_total_amount %>
+				<tr>
+					<td></td>
+					<% cols_except_id.each do |col_item| %>
+						<% if col_item[:column_name] == :net_total_amount %>
+							<td style="font-weight: bold;text-align: <%= col_item[:align] %>;"><%= number_to_currency @total.first.net_total_amount.to_s, unit: "AED " %></td>
+						<% else %>
+							<td></td>
+						<% end %>
+					<% end %>
+				</tr>
+			<% end %>
+		</tfoot>
+
+	</table>
+</div>