vyapari 0.1.5dev9 → 0.1.5dev10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28ffe643842fcbd0f79cd728537aba00773433f3
-  data.tar.gz: 638c38653a4c40346741351bf787ff4716b0d5d5
+  metadata.gz: 78c3cde2ff155082088ef1e7606db93fca5223b0
+  data.tar.gz: 73bca11944d2b9f8996af22561030bd94094f0c1
 SHA512:
-  metadata.gz: 658da9c47f160b5f409388851aa626144f485f17f168f337f0b519d0e2be0d5f0c920f82d1305376f4880c4d36e52a7e7d8c1120811063365d2dfdd05bb799a0
-  data.tar.gz: fc7d1306d50295df05cac0a76b429c55833408cd7bf42be385af5eb215aff2438ca2b840e29b9792cef7a32cf929f57813e46a6aae33b183f357491f030d6965
+  metadata.gz: 5e5af5f8a109d10ea7161c5a34611ccf8d999b8e2b1543772bcb135cb630bb12ceb4aad6bff8a2729b6d79007087ea2aac79663bd0c15bd2f01b59951dabdfb3
+  data.tar.gz: 1e07162b8f01363c58c93567608d67a93dae49ebeb595dec43347a7c170f3145163f05c2882b1610ea2abdd53f175061e84b9ca684e8a9a5b7fd211da9ea272d

data/app/controllers/vyapari/store_manager/base_controller.rb

@@ -23,6 +23,9 @@ module Vyapari
         @filter_param_mapping[:supplier] = :sp
         @filter_param_mapping[:brand] = :br
         @filter_param_mapping[:category] = :ct
+        @filter_param_mapping[:payment_method] = :pym
+        @filter_param_mapping[:terminal] = :trm
+        @filter_param_mapping[:user] = :usr
       end
       
     end	

data/app/controllers/vyapari/store_manager/dashboard_controller.rb

@@ -4,6 +4,7 @@ module Vyapari
 
 	  	# GET /dashboard
 	    def index
+	    	@date = params[:date] ? Date.parse(params[:date]) : Date.today
 	    	@terminals = @store.terminals
 	    end
 

data/app/controllers/vyapari/store_manager/reports/invoices_controller.rb

@@ -1,144 +1,249 @@
 module Vyapari
   module StoreManager
-	  module Reports
-  	  class InvoicesController < Vyapari::StoreManager::BaseController
+    module Reports
+      class InvoicesController < Vyapari::StoreManager::BaseController
 
         def index
-          @relation = Product.select("MAX(products.id) as id, 
-            MAX(products.name) as name, 
-            MAX(products.ean_sku) as ean_sku, 
-            MAX(products.purchased_price) as purchased_price, 
-            MAX(products.landed_price) as landed_price, 
-            MAX(products.selling_price) as selling_price, 
-            MAX(products.retail_price) as retail_price, 
-            MAX(se.status) as se_status, 
-            SUM(se.quantity) as se_quantity").
-          joins("LEFT JOIN stock_entries se ON se.product_id = products.id")
+          @relation = Invoice.select("
+            invoices.customer_name as customer_name, 
+            invoices.customer_address as customer_address, 
+            invoices.customer_phone as customer_phone, 
+            invoices.customer_email as customer_email, 
+
+            invoices.invoice_number as invoice_number, 
+            invoices.invoice_date as invoice_date, 
+
+            invoices.discount as discount, 
+            TRUNCATE(invoices.net_total_amount, 2) as net_total_amount, 
+
+            invoices.payment_method as payment_method,
+            invoices.credit_card_number as credit_card_number,
+            invoices.cheque_number as cheque_number,
+
+            u.name as user_name
+            ").
+          joins("LEFT JOIN users u ON invoices.user_id = u.id").
+          where("invoices.status = 'active'").
+          where("invoices.store_id = ?", @store.id)
           
           parse_filters
           apply_filters
+          set_columns
+          
+          @results = @relation.all
 
-          @results = @relation.group("products.id")
           @total = @relation.except(:select).
-          select("SUM(products.id) as id, 
-                  SUM(products.purchased_price) as purchased_price, 
-                  SUM(products.landed_price) as landed_price, 
-                  SUM(products.selling_price) as selling_price, 
-                  SUM(products.retail_price) as retail_price")
+          select("SUM(invoices.id) as id, 
+                  SUM(invoices.net_total_amount) as net_total_amount")
 
           render_report
         end
 
         private
 
-        def permitted_params
-          params.require(:invoice).permit(:discount, :adjustment, :money_taken, :notes, :payment_method, :customer_name, :customer_address, :customer_phone, :customer_email, :credit_card_number)
-        end
-
-        def resolve_layout
-          case action_name
-          when "show"
-            'kuppayam/print_a4'
-          else
-            'vyapari/terminal_staff'
+        def apply_filters
+          @relation = @relation.search(@query) if @query
+          
+          if @terminal == "null"
+            @relation = @relation.where("invoices.terminal_id IS NULL")
+          elsif @terminal
+            @relation = @relation.where("invoices.terminal_id = ?",@terminal.id)
           end
-        end
-
-  	    def resource_controller_configuration
-          {
-            collection_name: :invoices,
-            item_name: :invoice,
-            class: Invoice,
-            page_title: "#{@terminal.name} - Invoices",
-            js_view_path: "/kuppayam/workflows/peacock",
-            view_path: "/vyapari/terminal_staff/invoices"
-          }
-        end
 
-        def breadcrumbs_configuration
-  	      {
-  	        heading: "Invoices - #{@terminal.name}",
-  	        description: "Listing the invoices - #{@terminal.name}",
-  	        links: [
-              {name: "Change Terminal", link: store_manager_dashboard_path(@store), icon: 'fa-cog'},
-              {name: @terminal.name, link: terminal_staff_dashboard_path(@terminal), icon: 'fa-desktop'},
-              {name: "Invoices", link: nil, icon: 'fa-file', active: true}
-            ]
-  	      }
-  	    end
-
-        def get_collections
-          @relation = @terminal.invoices.includes(:user).where("")
-
-          parse_filters
-          apply_filters
-          
-          @invoices = @r_objects = @relation.page(@current_page).per(@per_page)
-          
-          return true
-        end
+          if @user == "null"
+            @relation = @relation.where("invoices.user_id IS NULL")
+          elsif @user
+            @relation = @relation.where("invoices.user_id = ?",@user.id)
+          end
 
-        def apply_filters
-          @relation = @relation.search(@query) if @query
-          @relation = @relation.status(@status) if @status
-          @relation = @relation.payment_method(@payment_method) if @payment_method
+          if @payment_method == "null"
+            @relation = @relation.where("invoices.payment_method IS NULL")
+          elsif @payment_method
+            @relation = @relation.where("invoices.payment_method = ?",@payment_method)
+          end
           
-          # if @fterminal == "null"
-          #   @relation = @relation.where("invoices.terminal_id IS NULL")
-          # elsif @fterminal
-          #   @relation = @relation.where("invoices.terminal_id = ?", @fterminal.id)
-          # end
-
-          # if @fstore == "null"
-          #   @relation = @relation.where("invoices.store_id IS NULL")
-          # elsif @fstore
-          #   @relation = @relation.where("invoices.store_id = ?", @fstore.id)
-          # end
-
-          # if @user == "null"
-          #   @relation = @relation.where("invoices.user_id IS NULL")
-          # elsif @user
-          #   @relation = @relation.where("invoices.user_id = ?", @terminal.id)
-          # end
-
-          @order_by = "created_at desc" unless @order_by
-          @relation = @relation.order(@order_by)
+          @relation = @relation.order(@order_by_options[@order_by.to_sym])
         end
 
         def configure_filter_settings
+          
+          @order_by_options = {
+              invoice_date_desc: "invoices.invoice_date DESC", 
+              invoice_date_asc: "invoices.invoice_date ASC", 
+              customer_name_desc: "invoices.customer_name DESC",
+              customer_name_asc: "invoices.customer_name ASC",
+              total_amount_asc: "invoices.net_total_amount DeSC",
+              total_amount_asc: "invoices.net_total_amount ASC"
+          }
+          
           @filter_settings = {
             string_filters: [
               { filter_name: :query },
-              { filter_name: :status },
+              { filter_name: :order_by, options: {default: :invoice_date_desc} },
               { filter_name: :payment_method }
             ],
-            boolean_filters: [],
+
             reference_filters: [
               { filter_name: :user, filter_class: User },
-              { filter_name: :fstore, filter_class: Store },
-              { filter_name: :fterminal, filter_class: Terminal }
+              { filter_name: :terminal, filter_class: Terminal },
             ],
+
             variable_filters: [
-              #{ variable_name: :store, filter_name: :store },
-              #{ variable_name: :terminal, filter_name: :terminal }
+              { variable_name: :store, filter_name: :store }
             ]
           }
         end
 
         def configure_filter_ui_settings
-          @filter_ui_settings = {}
+          @filter_ui_settings = {
+            terminal: {
+              object_filter: true,
+              select_label: 'Filter by Terminal',
+              current_value: @terminal,
+              values: @store.terminals.order(:name).all,
+              current_filters: @filters,
+              url_method_name: 'store_manager_invoices_report_url',
+              filters_to_remove: [:terminal, :store],
+              filters_to_add: {},
+              show_null_filter_on_top: false
+            },
+            user: {
+              object_filter: true,
+              select_label: 'Filter by User',
+              current_value: @user,
+              values: User.order(:name).all,
+              current_filters: @filters,
+              url_method_name: 'store_manager_invoices_report_url',
+              filters_to_remove: [:terminal, :store],
+              filters_to_add: {},
+              show_null_filter_on_top: true
+            },
+            payment_method: {
+              object_filter: false,
+              select_label: "Filter by Payment Method",
+              display_hash: Invoice::PAYMENT_METHOD_REVERSE,
+              current_value: @payment_method,
+              values: Invoice::PAYMENT_METHOD,
+              current_filters: @filters,
+              filters_to_remove: [],
+              filters_to_add: {},
+              url_method_name: 'store_manager_invoices_report_url',
+              show_all_filter_on_top: true
+            },
+            order_by: {
+              object_filter: false,
+              select_label: "Order by",
+              display_hash: Hash[@order_by_options.keys.map {|i| [i, i.to_s.titleize]}],
+              current_value: @order_by,
+              values: Hash[@order_by_options.keys.map {|i| [i.to_s.titleize, i]}],
+              current_filters: @filters,
+              filters_to_remove: [],
+              filters_to_add: {},
+              url_method_name: 'store_manager_invoices_report_url',
+              show_all_filter_on_top: true
+            },
+          }
+        end
+
+        def set_columns
+          @columns = [
+            { column_name: :id, display_name: "Sl.", align: "center", column_type: :integer },
+            { column_name: :customer_name, display_name: "Customer Name", align: "center", column_type: :string },
+            { column_name: :customer_address, display_name: "Customer Address", align: "center", column_type: :string },
+            { column_name: :customer_phone, display_name: "Customer Phone", align: "center", column_type: :string },
+            { column_name: :customer_email, display_name: "Customer Email", align: "center", column_type: :string },
+            { column_name: :invoice_number, display_name: "Invoice Number", align: "center", column_type: :string },
+            { column_name: :invoice_date, display_name: "Invoice Date", align: "center", column_type: :date },
+            { column_name: :discount, display_name: "Discount %", align: "center", column_type: :integer },
+            { column_name: :net_total_amount, display_name: "Total Amount", align: "right", column_type: :currency },
+            { column_name: :payment_method, display_name: "Payment Method", align: "center", column_type: :status },
+            { column_name: :credit_card_number, display_name: "Credit Card Number", align: "center", column_type: :string },
+            { column_name: :cheque_number, display_name: "Cheque Number", align: "center", column_type: :string },
+            { column_name: :user_name, display_name: "User", align: "center", column_type: :string }
+          ]
+
+          if params[:cols]
+            @selected_columns = params[:cols].map{|x| x.to_sym}
+          else
+            @selected_columns = [:id, :invoice_number, :invoice_date, :net_total_amount]
+          end
+        end
+
+        def breadcrumbs_configuration
+          {
+            heading: "Invoices Report",
+            description: "Invoices Report",
+            links: [{name: "Change Store", link: user_dashboard_path, icon: 'fa-desktop'}, 
+                      {name: @store.name, link: store_manager_dashboard_path(@store), icon: 'fa-dashboard'}, 
+                      {name: "Invoices Reports", link: nil, icon: 'fa-list', active: true}]
+          }
+        end
+
+        def set_navs
+          set_nav("store_manager/reports")
         end
 
-        def resource_url(obj)
-          url_for([:terminal_staff, @terminal, obj])
+        def render_report
+          respond_to do |format|
+            format.html {}
+            format.csv do 
+              send_data generate_csv(@results), 
+                      :type => 'text/csv; charset=utf-8; header=present', 
+                      :disposition => "attachment; filename=invoice-report.csv", 
+                      :filename => "invoice-report.csv"
+            end
+            format.pdf do
+              render :pdf => "#{@heading} (As on #{Date.today})"
+                   #:disposition => 'attachment'
+                   #:show_as_html => true
+            end
+          end
         end
 
-  	    def set_navs
-          set_nav("terminal_staff/invoices")
-  	    end
+        def generate_csv(results)
+          
+          CSV.generate(headers: true) do |csv|
+            # Adding the headings
+            csv << @columns.select{|col_item| @selected_columns.include?(col_item[:column_name])}.collect{|x| x[:display_name]}
+
+            # Adding the results
+            @results.each_with_index do |result, i|
+              
+              # Remove Id as we get it with i in each_with_index
+              cols_without_id = @columns.reject{|col_item| col_item[:column_name] == :id}
+              
+              # Select columns which are selected by the user / default
+              selected_cols = cols_without_id.select{|col_item| @selected_columns.include?(col_item[:column_name]) }
+              
+              # Initialize result row with just serial number
+              result_data = [i+1]
+
+              # Iterate selected columns and populate the result data
+              selected_cols.each do |col_item|
+
+                case col_item[:column_type]
+                when :string, :integer
+                  result_data << result.send(col_item[:column_name])
+                when :status
+                  result_data << result.send(col_item[:column_name]).titleize
+                when :currency
+                  result_data << sprintf("%.2f", result.send(col_item[:column_name]))
+                when :date
+                  result_data << result.send(col_item[:column_name]).strftime("%d-%m-%Y")
+                else
+                  result_data << result.send(col_item[:column_name])
+                end
+
+              end
+
+              # Append to CSV
+              csv << result_data
+            end
+          end
+
+        end
 
-  	  end
+      end
     end
-	end
+  end
 end
-

data/app/controllers/vyapari/store_manager/reports/sales_controller.rb

@@ -0,0 +1,299 @@
+module Vyapari
+  module StoreManager
+    module Reports
+      class SalesController < Vyapari::StoreManager::BaseController
+
+
+        # select p.name, p.ean_sku, p.retail_price, 
+        # se.quantity, i.invoice_number, i.invoice_date, 
+        # i.payment_method from stock_entries se 
+        # left join products p on p.id = se.product_id 
+        # left join invoices i on i.id = se.invoice_id 
+        # where se.status = 'sold'
+        def index
+          @relation = StockEntry.select("p.name as product_name, 
+            p.ean_sku as ean_sku, 
+            p.retail_price as retail_price, 
+            stock_entries.quantity as quantity, 
+            u.name as user_name, 
+            i.invoice_number as invoice_number, 
+            i.invoice_date as invoice_date, 
+            i.payment_method as payment_method").
+          joins("LEFT JOIN products p ON stock_entries.product_id = p.id").
+          joins("LEFT JOIN invoices i ON stock_entries.invoice_id = i.id").
+          joins("LEFT JOIN users u ON i.user_id = u.id").
+          where("stock_entries.status = 'sold'").
+          where("stock_entries.store_id = ?", @store.id)
+          
+          parse_filters
+          apply_filters
+          set_columns
+
+          #.page(@current_page).per(@per_page)
+          @results = @relation.all
+
+          @total = @relation.except(:select).
+          select("SUM(stock_entries.id) as id, 
+                  SUM(p.retail_price) as retail_price")
+
+          render_report
+        end
+
+        # select MAX(p.id) as id, MAX(p.name) as name, 
+        # MAX(p.ean_sku) as ean_sku, 
+        # MAX(p.purchased_price) as purchased_price, 
+        # MAX(p.landed_price) as landed_price, 
+        # MAX(p.selling_price) as selling_price, 
+        # MAX(p.retail_price) as retail_price, 
+        # SUM(se.quantity) as se_quantity, 
+        # MAX(se.status) as se_status 
+        # from products p left join stock_entries se 
+        # on se.product_id = p.id group by p.id;
+        def index_old
+          @relation = Product.select("MAX(products.id) as id, 
+            MAX(products.name) as name, 
+            MAX(products.ean_sku) as ean_sku, 
+            MAX(products.purchased_price) as purchased_price, 
+            MAX(products.landed_price) as landed_price, 
+            MAX(products.selling_price) as selling_price, 
+            MAX(products.retail_price) as retail_price, 
+            MAX(se.status) as se_status, 
+            SUM(se.quantity) as se_quantity").
+          joins("LEFT JOIN stock_entries se ON se.product_id = products.id")
+          
+          parse_filters
+          apply_filters
+
+          @results = @relation.group("products.id").page(@current_page).per(@per_page)
+          @total = @relation.except(:select).
+          select("SUM(products.id) as id, 
+                  SUM(products.purchased_price) as purchased_price, 
+                  SUM(products.landed_price) as landed_price, 
+                  SUM(products.selling_price) as selling_price, 
+                  SUM(products.retail_price) as retail_price")
+
+          render_report
+        end
+        
+        private
+
+        def apply_filters
+          @relation = @relation.search(@query) if @query
+          # @relation = @relation.where("se.se_status = ?", @status) if @status
+
+          if @terminal == "null"
+            @relation = @relation.where("i.terminal_id IS NULL")
+          elsif @terminal
+            @relation = @relation.where("i.terminal_id = ?",@terminal.id)
+          end
+
+          if @brand == "null"
+            @relation = @relation.where("p.brand_id IS NULL")
+          elsif @brand
+            @relation = @relation.where("p.brand_id = ?",@brand.id)
+          end
+
+          if @category == "null"
+            @relation = @relation.where("p.category_id IS NULL")
+          elsif @category
+            @relation = @relation.where("p.category_id = ?",@category.id)
+          end
+
+          if @payment_method == "null"
+            @relation = @relation.where("i.payment_method IS NULL")
+          elsif @payment_method
+            @relation = @relation.where("i.payment_method = ?",@payment_method)
+          end
+          
+          @relation = @relation.order(@order_by_options[@order_by.to_sym])
+        end
+
+        def set_columns
+          @columns = [
+            { column_name: :id, display_name: "Sl.", align: "center", column_type: :integer },
+            { column_name: :product_name, display_name: "Product Name", align: "left", column_type: :string },
+            { column_name: :ean_sku, display_name: "EAN/SKU", align: "left", column_type: :string },
+            { column_name: :retail_price, display_name: "Retail Price", align: "right", column_type: :currency },
+            { column_name: :quantity, display_name: "Quantity", align: "center", column_type: :integer },
+            { column_name: :invoice_number, display_name: "Invoice Number", align: "center", column_type: :string },
+            { column_name: :invoice_date, display_name: "Invoice Date", align: "center", column_type: :date },
+            { column_name: :payment_method, display_name: "Payment Method", align: "center", column_type: :status },
+            { column_name: :user_name, display_name: "User", align: "center", column_type: :string }
+          ]
+
+          if params[:cols]
+            @selected_columns = params[:cols].map{|x| x.to_sym}
+          else
+            @selected_columns = [:id, :product_name, :ean_sku, :retail_price, :quantity, :invoice_number]
+          end
+        end
+
+        def configure_filter_settings
+          
+          @order_by_options = {
+              invoice_date_desc: "i.invoice_date DESC", 
+              invoice_date_asc: "i.invoice_date ASC", 
+              quantity_desc: "stock_entries.quantity DESC",
+              quantity_asc: "stock_entries.quantity ASC",
+              product_name_asc: "p.name ASC, p.ean_sku ASC",
+              product_name_desc: "p.name DESC, p.ean_sku DESc"}
+          
+          @filter_settings = {
+            string_filters: [
+              { filter_name: :query },
+              { filter_name: :order_by, options: {default: :invoice_date_desc} },
+              { filter_name: :payment_method }
+            ],
+
+            reference_filters: [
+              { filter_name: :brand, filter_class: Brand },
+              { filter_name: :category, filter_class: Category },
+              { filter_name: :terminal, filter_class: Terminal },
+            ],
+
+            variable_filters: [
+              { variable_name: :store, filter_name: :store }
+            ]
+          }
+        end
+
+        def configure_filter_ui_settings
+          @filter_ui_settings = {
+            terminal: {
+              object_filter: true,
+              select_label: 'Filter by Terminal',
+              current_value: @terminal,
+              values: @store.terminals.order(:name).all,
+              current_filters: @filters,
+              url_method_name: 'store_manager_sales_report_url',
+              filters_to_remove: [:terminal, :store],
+              filters_to_add: {},
+              show_null_filter_on_top: false
+            },
+            brand: {
+              object_filter: true,
+              select_label: 'Filter by Brand',
+              current_value: @brand,
+              values: Brand.order(:name).all,
+              current_filters: @filters,
+              url_method_name: 'store_manager_sales_report_url',
+              filters_to_remove: [:terminal, :store],
+              filters_to_add: {},
+              show_null_filter_on_top: true
+            },
+            category: {
+              object_filter: true,
+              select_label: 'Filter by Category',
+              current_value: @category,
+              values: Category.order(:name).all,
+              current_filters: @filters,
+              url_method_name: 'store_manager_sales_report_url',
+              filters_to_remove: [:terminal, :store],
+              filters_to_add: {},
+              show_null_filter_on_top: true
+            },
+            payment_method: {
+              object_filter: false,
+              select_label: "Filter by Payment Method",
+              display_hash: Invoice::PAYMENT_METHOD_REVERSE,
+              current_value: @payment_method,
+              values: Invoice::PAYMENT_METHOD,
+              current_filters: @filters,
+              filters_to_remove: [],
+              filters_to_add: {},
+              url_method_name: 'store_manager_sales_report_url',
+              show_all_filter_on_top: true
+            },
+            order_by: {
+              object_filter: false,
+              select_label: "Order by",
+              display_hash: Hash[@order_by_options.keys.map {|i| [i, i.to_s.titleize]}],
+              current_value: @order_by,
+              values: Hash[@order_by_options.keys.map {|i| [i.to_s.titleize, i]}],
+              current_filters: @filters,
+              filters_to_remove: [],
+              filters_to_add: {},
+              url_method_name: 'store_manager_sales_report_url',
+              show_all_filter_on_top: true
+            },
+          }
+        end
+
+        def breadcrumbs_configuration
+          {
+            heading: "Sales Report",
+            description: "Sales Report",
+            links: [{name: "Change Store", link: user_dashboard_path, icon: 'fa-desktop'}, 
+                      {name: @store.name, link: store_manager_dashboard_path(@store), icon: 'fa-dashboard'}, 
+                      {name: "Sales Reports", link: nil, icon: 'fa-list', active: true}]
+          }
+        end
+
+      	def set_navs
+          set_nav("store_manager/reports")
+        end
+
+        def render_report
+          respond_to do |format|
+            format.html {}
+            format.csv do 
+              send_data generate_csv(@results), 
+                      :type => 'text/csv; charset=utf-8; header=present', 
+                      :disposition => "attachment; filename=sales-report.csv", 
+                      :filename => "sales-report.csv"
+            end
+            format.pdf do
+              render :pdf => "#{@heading} (As on #{Date.today})"
+                   #:disposition => 'attachment'
+                   #:show_as_html => true
+            end
+          end
+        end
+
+        def generate_csv(results)
+          
+          CSV.generate(headers: true) do |csv|
+            # Adding the headings
+            csv << @columns.select{|col_item| @selected_columns.include?(col_item[:column_name])}.collect{|x| x[:display_name]}
+
+            # Adding the results
+            @results.each_with_index do |result, i|
+              
+              # Remove Id as we get it with i in each_with_index
+              cols_without_id = @columns.reject{|col_item| col_item[:column_name] == :id}
+              
+              # Select columns which are selected by the user / default
+              selected_cols = cols_without_id.select{|col_item| @selected_columns.include?(col_item[:column_name]) }
+              
+              # Initialize result row with just serial number
+              result_data = [i+1]
+
+              # Iterate selected columns and populate the result data
+              selected_cols.each do |col_item|
+
+                case col_item[:column_type]
+                when :string, :integer
+                  result_data << result.send(col_item[:column_name])
+                when :status
+                  result_data << result.send(col_item[:column_name]).titleize
+                when :currency
+                  result_data << sprintf("%.2f", result.send(col_item[:column_name]))
+                when :date
+                  result_data << result.send(col_item[:column_name]).strftime("%d-%m-%Y")
+                else
+                  result_data << result.send(col_item[:column_name])
+                end
+
+              end
+
+              # Append to CSV
+              csv << result_data
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end