vyapari 0.1.5dev7 → 0.1.5dev8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f9bdd187c40ecef46dce3e59a138186068e3d2a
-  data.tar.gz: b64bcb290c080bb84cbb20a642630c98150786e2
+  metadata.gz: e3f2f3a46d81aa05666be22078453d313b07f690
+  data.tar.gz: 18f1f8438cd8a37174c5c9b6472f0995971eb080
 SHA512:
-  metadata.gz: f9e36ac86471ca56737302ccc19ba1505f734d2072a9bd62d7011e5e603f4a93a1ddef1f24417a43169a3718a45c065b914e6345ba22c29f1c27b4f4e1a67cee
-  data.tar.gz: b64a93bda9422a4bccb9844a8fb4de7f4cb5aa6485d4c039c1a129498ee47824e96e1592516ec4de93f2b90270435508446af37233583216eb05cba095625c25
+  metadata.gz: 2cf6df83b781ff72492a6eab935ef8e339526228bd7a90f9c61ec94cd324dd51f23ef8ac56356ce8978d5235c21d3f68ce08b86ca54fe4a3ce56a2ce41073c36
+  data.tar.gz: 315b00a715c43a87a070cf5427e89ccce08f3725116660a1498f2defdbe2e2d46c23f4a5bf5bf9ea431e2c8e151813a95624dfbbcf0003cebdfe8cde161443fe

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

@@ -0,0 +1,144 @@
+module Vyapari
+  module StoreManager
+	  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")
+          
+          parse_filters
+          apply_filters
+
+          @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")
+
+          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'
+          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
+
+        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 @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)
+        end
+
+        def configure_filter_settings
+          @filter_settings = {
+            string_filters: [
+              { filter_name: :query },
+              { filter_name: :status },
+              { 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 }
+            ],
+            variable_filters: [
+              #{ variable_name: :store, filter_name: :store },
+              #{ variable_name: :terminal, filter_name: :terminal }
+            ]
+          }
+        end
+
+        def configure_filter_ui_settings
+          @filter_ui_settings = {}
+        end
+
+        def resource_url(obj)
+          url_for([:terminal_staff, @terminal, obj])
+        end
+
+  	    def set_navs
+          set_nav("terminal_staff/invoices")
+  	    end
+
+  	  end
+    end
+	end
+end
+

data/app/controllers/vyapari/terminal_staff/invoices_controller.rb

@@ -93,7 +93,7 @@ module Vyapari
 	    end
 
       def get_collections
-        @relation = @terminal.invoices.where("")
+        @relation = @terminal.invoices.includes(:user).where("")
 
         parse_filters
         apply_filters
@@ -108,18 +108,6 @@ module Vyapari
         @relation = @relation.status(@status) if @status
         @relation = @relation.payment_method(@payment_method) if @payment_method
         
-        if @terminal == "null"
-          @relation = @relation.where("invoices.terminal_id IS NULL")
-        elsif @terminal
-          @relation = @relation.where("invoices.terminal_id = ?", @terminal.id)
-        end
-
-        if @store == "null"
-          @relation = @relation.where("invoices.store_id IS NULL")
-        elsif @store
-          @relation = @relation.where("invoices.store_id = ?", @terminal.id)
-        end
-
         if @user == "null"
           @relation = @relation.where("invoices.user_id IS NULL")
         elsif @user
@@ -139,14 +127,9 @@ module Vyapari
           ],
           boolean_filters: [],
           reference_filters: [
-            { filter_name: :user, filter_class: User },
-            { filter_name: :fstore, filter_class: Store },
-            { filter_name: :fterminal, filter_class: Terminal }
+            { filter_name: :user, filter_class: User }
           ],
-          variable_filters: [
-            #{ variable_name: :store, filter_name: :store },
-            #{ variable_name: :terminal, filter_name: :terminal }
-          ]
+          variable_filters: []
         }
       end
 
@@ -154,12 +137,8 @@ module Vyapari
         @filter_ui_settings = {}
       end
 
-      def resource_url(obj)
-        url_for([:terminal_staff, @terminal, obj])
-      end
-
-	    def set_navs
-        set_nav("terminal_staff/invoices")
+      def set_navs
+        set_nav("staff_manager/invoices")
 	    end
 
 	  end

data/app/views/vyapari/terminal_staff/dashboard/_counts.html.erb

@@ -27,7 +27,7 @@
 			<div class="xe-upper">
 				
 				<div class="xe-icon">
-					<i class="fa-usd"></i>
+					<i class="fa-money"></i>
 				</div>
 				<div class="xe-label">
 					<strong class="num"><%= number_to_currency total_invoice_amount, unit: "AED " %></strong>

data/lib/vyapari/version.rb

@@ -1,3 +1,3 @@
 module Vyapari
-  VERSION = '0.1.5dev7'
+  VERSION = '0.1.5dev8'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vyapari
 version: !ruby/object:Gem::Version
-  version: 0.1.5dev7
+  version: 0.1.5dev8
 platform: ruby
 authors:
 - kpvarma
@@ -350,6 +350,7 @@ files:
 - app/controllers/vyapari/application_controller.rb
 - app/controllers/vyapari/store_manager/base_controller.rb
 - app/controllers/vyapari/store_manager/dashboard_controller.rb
+- app/controllers/vyapari/store_manager/reports/invoices_controller.rb
 - app/controllers/vyapari/store_manager/reports/stock_controller.rb
 - app/controllers/vyapari/store_manager/resource_controller.rb
 - app/controllers/vyapari/store_manager/stock_bundles_controller.rb