vyapari 0.1.5dev6 → 0.1.5dev7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77082c9dd19cd963d7c96b8b4a43133743571513
-  data.tar.gz: 963cb3c4cb2a9bc7d43adb6e2afc4d5acfab8d39
+  metadata.gz: 7f9bdd187c40ecef46dce3e59a138186068e3d2a
+  data.tar.gz: b64bcb290c080bb84cbb20a642630c98150786e2
 SHA512:
-  metadata.gz: b41a5d12cc1a633fc218b7522d14f3842db6c33cd20af5be8bb59b7ea3e488e937b14e65aa1147b13101cf693f27f78f67e04f2f3016fa9dc2a90ea354c8c6d5
-  data.tar.gz: 3ed2aed1a6ce119c1fbd3915d5baec5d194da97321c2b5758e6ea368aeaff4e8ff66c47563ed046db6f900da495d12af6cb829b3567b6bb664d58991525ba227
+  metadata.gz: f9e36ac86471ca56737302ccc19ba1505f734d2072a9bd62d7011e5e603f4a93a1ddef1f24417a43169a3718a45c065b914e6345ba22c29f1c27b4f4e1a67cee
+  data.tar.gz: b64a93bda9422a4bccb9844a8fb4de7f4cb5aa6485d4c039c1a129498ee47824e96e1592516ec4de93f2b90270435508446af37233583216eb05cba095625c25

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

@@ -19,9 +19,18 @@ module Vyapari
 
       def configure_filter_param_mapping
         @filter_param_mapping = default_filter_param_mapping
-        @filter_param_mapping[:terminal] = :tm
+        
+        # Variable Filters
         @filter_param_mapping[:store] = :st
+        @filter_param_mapping[:terminal] = :tm
+
+        # Second variable for mapping reference filters
+        @filter_param_mapping[:fstore] = :fst
+        @filter_param_mapping[:fterminal] = :ftm
+        
         @filter_param_mapping[:supplier] = :sp
+        @filter_param_mapping[:user] = :us
+        @filter_param_mapping[:payment_method] = :pm
       end
       
     end	

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

@@ -6,6 +6,11 @@ module Vyapari
 	    def index
 	    end
 
+	    def search
+	    	@query = params[:query]
+	    	@products = Product.search(@query).page(@current_page).per(50)
+	    end
+
 	    private
 
 	    def breadcrumbs_configuration

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

@@ -85,9 +85,7 @@ module Vyapari
 	        heading: "Invoices - #{@terminal.name}",
 	        description: "Listing the invoices - #{@terminal.name}",
 	        links: [
-            {name: "Home", link: user_dashboard_path, icon: 'fa-dashboard'},
-            {name: @store.name, link: store_manager_dashboard_path(@store), icon: 'fa-dashboard'},
-            {name: "Stock Entries", link: nil, icon: 'fa-truck', active: true},
+            {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}
           ]
@@ -107,12 +105,26 @@ module Vyapari
 
       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 @terminal == "null"
-        #   @relation = @relation.where("invoices.terminal_id IS NULL")
-        # elsif @terminal
-        #   @relation = @relation.where("invoices.terminal_id = ?", @terminal.id)
-        # end
+        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
+          @relation = @relation.where("invoices.user_id = ?", @terminal.id)
+        end
 
         @order_by = "created_at desc" unless @order_by
         @relation = @relation.order(@order_by)
@@ -121,13 +133,20 @@ module Vyapari
       def configure_filter_settings
         @filter_settings = {
           string_filters: [
-            { filter_name: :query }
+            { filter_name: :query },
+            { filter_name: :status },
+            { filter_name: :payment_method }
           ],
           boolean_filters: [],
           reference_filters: [
-            { filter_name: :terminal, filter_class: Terminal },
+            { filter_name: :user, filter_class: User },
+            { filter_name: :fstore, filter_class: Store },
+            { filter_name: :fterminal, filter_class: Terminal }
           ],
-          variable_filters: [],
+          variable_filters: [
+            #{ variable_name: :store, filter_name: :store },
+            #{ variable_name: :terminal, filter_name: :terminal }
+          ]
         }
       end
 

data/app/models/invoice.rb

@@ -54,6 +54,8 @@ class Invoice < Vyapari::ApplicationRecord
   scope :credit_card_invoices, -> { where(payment_method: CREDIT_CARD) }
   scope :cheque_invoices, -> { where(payment_method: CHEQUE) }
 
+  scope :payment_method, lambda { |pm| where("LOWER(payment_method)='#{payment_method}'") }
+
   scope :this_month, lambda { where("created_at >= ? AND created_at <= ?", Time.zone.now.beginning_of_month, Time.zone.now.end_of_month) }
   scope :today, lambda { where('DATE(created_at) = ?', Date.today)}
   

data/app/models/product.rb

@@ -34,13 +34,14 @@ class Product < Vyapari::ApplicationRecord
   # == Examples
   #   >>> object.search(query)
   #   => ActiveRecord::Relation object
-  scope :search, lambda {|query| joins("INNER JOIN categories on categories.id = products.category_id").
-                                 where("LOWER(products.name) LIKE LOWER('%#{query}%') OR\
+  scope :search, lambda {|query| joins("LEFT JOIN categories on categories.id = products.category_id").
+                                 where("LOWER(products.ean_sku) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(products.reference_number) LIKE LOWER('%#{query}%') OR\
+                                        LOWER(products.name) LIKE LOWER('%#{query}%') OR\
                                         LOWER(products.one_liner) LIKE LOWER('%#{query}%') OR\
                                         LOWER(products.description) LIKE LOWER('%#{query}%') OR\
                                         LOWER(categories.name) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(categories.one_liner) LIKE LOWER('%#{query}%') OR\
-                                        LOWER(categories.description) LIKE LOWER('%#{query}%')")
+                                        LOWER(categories.one_liner) LIKE LOWER('%#{query}%')")
                         }
 
   scope :status, lambda { |status| where("LOWER(status)='#{status}'") }

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

@@ -1,41 +1,44 @@
-<% 
-	active_invoices = @terminal.invoices.active.count
-	draft_invoices = @terminal.invoices.draft.count
-	active_amount = @terminal.invoices.active.sum(:net_total_amount)
-	draft_amount = @terminal.invoices.draft.sum(:net_total_amount)
-	cash_invoices = @terminal.invoices.active.where(payment_method: :cash).count
-	credit_card_invoices = @terminal.invoices.active.where(payment_method: :credit_card).count
-	cash_in_hand = @terminal.invoices.active.cash_invoices.sum(:net_total_amount)
-	credit_card_amount = @terminal.invoices.active.credit_card_invoices.sum(:net_total_amount)
-	total_sales = 100
+<%
+
+	total_invoice_amount = @terminal.invoices.today.active.sum(:net_total_amount) 
+
+	total_invoices = @terminal.invoices.today.active.count
+	
+	total_cash = @terminal.invoices.today.active.cash_invoices.sum(:net_total_amount)
+
+	total_cash_invoices = @terminal.invoices.today.active.where(payment_method: :cash).count
+
+	total_credit = @terminal.invoices.today.active.credit_card_invoices.sum(:net_total_amount)
+
+	total_credit_card_invoices = @terminal.invoices.today.active.where(payment_method: :credit_card).count
+
 %>
 
 <div class="row">
 	<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", style: "height:50px" %>
+		<%= 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 Invoice"), terminal_staff_invoices_path(@terminal), class: "btn btn-primary btn-only-hover btn-lg btn-block", 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 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-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>
+					<i class="fa-usd"></i>
 				</div>
 				<div class="xe-label">
-					<strong class="num"><%= number_to_currency cash_in_hand, unit: "AED " %></strong>
-					<span>Cash In Hand</span>
+					<strong class="num"><%= number_to_currency total_invoice_amount, unit: "AED " %></strong>
+					<span>Total Invoice Amount</span>
 				</div>
 				
 			</div>
 			<div class="xe-lower">
 				<div class="border"></div>
 				
-				<span>Total Cash Invoices</span>
-				<strong><%= cash_invoices %></strong>
+				<span>Total Invoices: <b><%= total_invoices %></b></span>
 			</div>
 		</div>
 	</div>
@@ -46,45 +49,40 @@
 			<div class="xe-upper">
 				
 				<div class="xe-icon">
-					<i class="fa-floppy-o"></i>
+					<i class="fa-money"></i>
 				</div>
 				<div class="xe-label">
-					<strong class="num"><%= number_to_currency credit_card_amount, unit: "AED " %></strong>
-					<span>Total CC AMount</span>
+					<strong class="num"><%= number_to_currency total_cash, unit: "AED " %></strong>
+					<span>Total Cash</span>
 				</div>
 				
 			</div>
 			<div class="xe-lower">
 				<div class="border"></div>
 				
-				<!-- <span>Total Amount Billed Today</span> -->
-				<!-- <strong><%#= number_to_currency active_amount, unit: "AED " %></strong> -->
+				<span>Total Cash Invoices: <b><%= total_cash_invoices %></b></span>
+				
 			</div>
 		</div>
 	</div>
 
 	<div class="col-sm-3">
 					
-		<div class="xe-widget xe-counter-block xe-counter-block-gray" data-suffix="k" data-count=".num" data-from="0" data-to="310" data-duration="4" data-easing="false">
+		<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-pencil-square-o"></i>
+					<i class="fa-credit-card"></i>
 				</div>
 				<div class="xe-label">
-					<strong class="num"><%= draft_invoices %></strong>
-					<span>Draft Invoices</span>
+					<strong class="num"><%= number_to_currency total_credit, unit: "AED " %></strong>
+					<span>Total CC Amount</span>
 				</div>
-				
 			</div>
 			<div class="xe-lower">
 				<div class="border"></div>
-				
-				<span>Total Amount Un-Billed</span>
-				<strong><%= number_to_currency draft_amount, unit: "AED " %></strong>
+				<span>Total Credit Card Invoices: <b><%= total_credit_card_invoices %></b></span>
 			</div>
 		</div>
 	</div>
-
-	
 </div>

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

@@ -3,7 +3,7 @@
 	  <thead> 
 			<tr> 
 				<th>Invoice Number</th>
-				<th>Customer</th>
+				<th>Payment Method</th>
 				<!-- <th>Date</th> -->
 				<th style="text-align: right;">Total Amount</th>
 			</tr> 
@@ -18,15 +18,17 @@
 
 	  			<% if invoice.draft? %>
 		  			<td class="invoice-name"><%= link_to invoice.invoice_number, edit_terminal_staff_invoice_path(@terminal, invoice), remote: true %></td>
-		  			<td class="invoice-name"><%= link_to customer_name, edit_terminal_staff_invoice_path(@terminal, invoice), remote: true %></td>
+		  			<!-- <td class="invoice-name"><%#= link_to customer_name, edit_terminal_staff_invoice_path(@terminal, invoice), remote: true %></td> -->
 		  		<% else %>
 		  			<td class="invoice-name"><%= link_to invoice.invoice_number, terminal_staff_invoice_path(@terminal, invoice), remote: true %></td>
-		  			<td class="invoice-name"><%= link_to customer_name, terminal_staff_invoice_path(@terminal, invoice), remote: true %></td>
+		  			<!-- <td class="invoice-name"><%#= link_to customer_name, terminal_staff_invoice_path(@terminal, invoice), remote: true %></td> -->
 		  		<% end %>
 
+		  		<td class="invoice-name" style="text-align: center;"><%= invoice.display_payment_method %></td>
+
 		      <!-- <td class="invoice-name" style="text-align: center;"><%#= invoice.invoice_date.strftime("%m/%d/%Y") if invoice.invoice_date %></td> -->
 
-		      <td class="invoice-name" style="text-align: center;"><%= number_to_currency invoice.net_total_amount, unit: "" %></td>
+		      <td class="invoice-name" style="text-align: center;"><%= number_to_currency invoice.net_total_amount, unit: "AED " %></td>
 
 		    </tr>
 		  <% end %>

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

@@ -0,0 +1,6 @@
+<form method="get" action="/terminal_staff/<%= @terminal.id %>/search" enctype="application/x-www-form-urlencoded" data-remote="true">
+	<input type="text" class="form-control input-lg" placeholder="Search..." name="query">
+	<button type="submit" class="btn-unstyled">
+		<i class="linecons-search"></i>
+	</button>
+</form>

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

@@ -0,0 +1,24 @@
+<div class="table-responsive"> 
+	<table class="table table-hover members-table middle-align">
+	  <thead> 
+			<tr> 
+				<th style="text-align: left;width:30%;">EAN / SKU</th>
+				<th style="text-align: left;width:50%;">Name</th>
+				<th style="text-align: right;width:20%;;">Price</th>
+			</tr> 
+		</thead>
+		
+	  <tbody>
+	  	<% @products.each_with_index do |product, i| %>
+
+	  		<tr id="tr_product_<%= product.id %>">
+		  		<td class="product-name"><%= product.ean_sku %></td>
+		  		<td class="product-name"><%= product.name %></td>
+		  		<td style="text-align: right;"><strong><%= number_to_currency product.retail_price, unit: "AED " %></strong></td>
+		  		</td>
+		    </tr>
+
+		  <% end %>
+	  </tbody>
+	</table>
+</div>

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

@@ -1,6 +1,10 @@
-<%= render :partial=>"vyapari/terminal_staff/dashboard/counts" -%>
 
-<div class="row">
+<div id="div_terminal_dashboard_counts">
+	<%= render :partial=>"vyapari/terminal_staff/dashboard/counts" -%>
+</div>
+
+
+<div class="row hidden-xs">
 	<div class="col-md-6">
 		<div class="panel panel-color panel-gray">
 
@@ -14,9 +18,7 @@
 				<%= render :partial=>"vyapari/terminal_staff/dashboard/invoices", locals: { invoices: active_invoices } -%>
 			</div>
 		</div>
-	</div>
 
-	<div class="col-md-6">
 		<div class="panel panel-color panel-gray">
 
 			<div class="panel-heading">
@@ -31,6 +33,24 @@
 			
 		</div>
 	</div>
+
+	<div class="col-md-6">
+		<div class="panel panel-color panel-gray">
+
+			<div class="panel-heading">
+				<h3 class="panel-title">Check Price</h3>
+			</div>
+
+			<div class="panel-body search-env">
+				<div id="div_terminal_dashboard_search_form">
+					<%= render :partial=>"vyapari/terminal_staff/dashboard/search_form" -%>
+				</div>
+				<div id="div_terminal_dashboard_search_results">
+				</div>
+			</div>
+			
+		</div>
+	</div>
 </div>
 
 <%= clear_tag(60) %>

data/app/views/vyapari/terminal_staff/dashboard/search.js.erb

@@ -0,0 +1,12 @@
+<% if @products.any? %>
+  
+  // Refresh the list
+  // $('#div_terminal_dashboard_search_form').html("<%#= escape_javascript(render(:partial=>"vyapari/terminal_staff/dashboard/search_form")) %>");
+  $('#div_terminal_dashboard_search_results').html("<%= escape_javascript(render(:partial=>"vyapari/terminal_staff/dashboard/search_results")) %>");
+  
+<% else %>
+
+	var noResultsText = "<%= escape_javascript(theme_panel_message(I18n.translate('success.no_results_found')))%>";
+  $('#div_terminal_dashboard_search_results').html(noResultsText);
+
+<% end %>

data/app/views/vyapari/terminal_staff/invoices/_index.html.erb

@@ -9,7 +9,9 @@
 				<th style="text-align: center;">Payment Method</th>
 				<th style="text-align: right;">Total Amount</th>
 				<th>Status</th>
+				<% if @current_user.has_role?("POS Sales Maanger") %>
 				<th style="text-align: center;">Actions</th>
+				<% end %>
 			</tr> 
 		</thead>
 		
@@ -42,6 +44,8 @@
 
 		      <td class="invoice-name" style="text-align: center;"><%= invoice.display_status %></td>
 
+		      <% if @current_user.has_role?("POS Sales Maanger") %>
+
 		      <td class="action-links" style="width:10%">
 
 		      	<%= link_to raw("<i class=\"linecons-pencil\"></i> Edit"), edit_link, :remote=>true, class: "edit" %>
@@ -50,6 +54,8 @@
 
 		      </td>
 
+		      <% end %>
+
 		    </tr>
 		  <% end %>
 	  </tbody>

data/app/views/vyapari/terminal_staff/invoices/_show.html.erb

@@ -97,7 +97,7 @@
 
 			<!-- Invoice Entries -->
 			<table class="table table-bordered mt-60">
-				<thead>
+				<thead class="hidden-xs">
 					<tr style="">
 						<th width="10%" class="text-center">No</th>
 						<th width="40%" class="text-center">Item</th>

data/app/views/vyapari/terminal_staff/invoices/index.html.erb

@@ -12,8 +12,6 @@
           <div class="row">
             <div class="col-md-6">
 
-              <%= theme_button('Create Invoice', 'plus', terminal_staff_invoices_path(@terminal), remote: false, classes: "pull-left", btn_type: "success") %>
-              
               <%= theme_button('Refresh', 'refresh', terminal_staff_invoices_path(@terminal), classes: "pull-left ml-10", btn_type: "white") %>
               
             </div>

data/app/views/vyapari/terminal_staff/invoices/new.js.erb

@@ -5,6 +5,8 @@
   var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/draft")) %>";
   showLargeModal(heading, bodyContent, false);
 
+  $('#div_terminal_dashboard_counts').html("<%= escape_javascript(render(:partial=>"vyapari/terminal_staff/dashboard/counts")) %>");
+
 <% else %>
 
   // Showing Growl Like Message

data/app/views/vyapari/terminal_staff/line_items/_index.html.erb

@@ -37,7 +37,7 @@
 
 </style>
 
-<div class="row ili" id="div_line_item_header">
+<div class="row ili hidden-xs" id="div_line_item_header">
 	<div class="col-md-1 li-heading li-sl li-center">#</div>
 	<div class="col-md-4 li-heading li-item-name li-left">Item</div>
 	<div class="col-md-2 li-heading li-quantity li-center">Quantity</div>

data/config/routes.rb

@@ -74,6 +74,7 @@ Vyapari::Engine.routes.draw do
     
     scope '/:terminal_id' do
       get   '/dashboard',         to: "dashboard#index",  as:   :dashboard
+      get   '/search',            to: "dashboard#search",  as:  :dashboard_search
       resources :invoices do
         resources :line_items
       end

data/lib/vyapari/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vyapari
 version: !ruby/object:Gem::Version
-  version: 0.1.5dev6
+  version: 0.1.5dev7
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-06 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -104,28 +104,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev2
+        version: 0.1.5dev3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev2
+        version: 0.1.5dev3
 - !ruby/object:Gem::Dependency
   name: usman
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev2
+        version: 0.1.5dev3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.5dev2
+        version: 0.1.5dev3
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -455,7 +455,10 @@ files:
 - app/views/vyapari/store_manager/stock_entries/index.html.erb
 - app/views/vyapari/terminal_staff/dashboard/_counts.html.erb
 - app/views/vyapari/terminal_staff/dashboard/_invoices.html.erb
+- app/views/vyapari/terminal_staff/dashboard/_search_form.html.erb
+- app/views/vyapari/terminal_staff/dashboard/_search_results.html.erb
 - app/views/vyapari/terminal_staff/dashboard/index.html.erb
+- app/views/vyapari/terminal_staff/dashboard/search.js.erb
 - app/views/vyapari/terminal_staff/invoices/_draft.html.erb
 - app/views/vyapari/terminal_staff/invoices/_form.html.erb
 - app/views/vyapari/terminal_staff/invoices/_index.html.erb