vyapari 0.1.5dev3 → 0.1.5dev4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a5a70a8c9483f8bc1a32832567af9dc9c6a24bf
-  data.tar.gz: ede330938d7e493e8c9dfc40072af96675fd66e0
+  metadata.gz: 86dac64cf698fda0ff1b7b40c71d5a547d584f3e
+  data.tar.gz: 2b5c2e4e0f94e4f5f22dedbbf074bd05086bdb23
 SHA512:
-  metadata.gz: 9dadf9707c521f3a303dce5839a6c9ed2bf14c558afca86ce52b6c4421056e4d66be51febd0cc450c9eac44531a1f5aa7007468a01beeeac9b1aa72f0aac7a68
-  data.tar.gz: af3c354a8e087062c9aa631449688cbecb20cef4eebb558e69b25fdbc8f2315bfad92557f9e878d297438ffd5a83eeb7571dc70ae61964a565f210654d00e0c0
+  metadata.gz: 0af9fb6fee9286773cf6325c20bfc6c6fbb2794047d6b1d625b2426e95b5a330f0db001ad797387a90e1071e53414eed8c1c1136d810a00abccd1c6b2d5b2c85
+  data.tar.gz: f9fafbdcf3e5dc91daf9108e6bd9bc1d555da479ca9a8f377546e49bed223ead0313c70c8ce3d6908ceb4a44f2ccf576fa4a2056ec76d61574fa96cb51567965

data/app/controllers/vyapari/application_controller.rb

@@ -10,8 +10,7 @@ module Vyapari
 	  end
 
 	  def default_redirect_url_after_sign_in
-      asd
-	  	vyapari.user_dashboard_url
+      vyapari.user_dashboard_url
       # if @current_user.has_role?("Admin")
       #   vyapari.admin_dashboard_url
       # elsif @current_user.has_role?("Admin")

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

@@ -21,6 +21,8 @@ module Vyapari
         @filter_param_mapping[:stock_bundle] = :sb
         @filter_param_mapping[:store] = :st
         @filter_param_mapping[:supplier] = :sp
+        @filter_param_mapping[:brand] = :br
+        @filter_param_mapping[:category] = :ct
       end
       
     end	

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

@@ -0,0 +1,132 @@
+module Vyapari
+  module StoreManager
+    module Reports
+      class StockController < Vyapari::StoreManager::BaseController
+
+
+        # 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
+          @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 apply_filters
+          @relation = @relation.search(@query) if @query
+          # @relation = @relation.where("se.se_status = ?", @status) if @status
+          
+          @order_by = "products.name ASC, products.ean_sku ASC" unless @order_by
+          @relation = @relation.order(@order_by)
+        end
+
+        def configure_filter_settings
+          @filter_settings = {
+            string_filters: [
+              { filter_name: :query },
+              { filter_name: :status, options: {default: :pending} }
+            ],
+
+            reference_filters: [
+              { filter_name: :brand, filter_class: Brand },
+              { filter_name: :category, filter_class: Category },
+            ],
+
+            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 filter_config_ui
+          return @filter_config_ui if @filter_config_ui
+          @filter_config_ui = {
+            brand: {
+              object_filter: true,
+              display_name: 'Select Brand',
+              current_value: @brand,
+              values: Brand.order(:name).all,
+              current_filters: @filters,
+              url_method_name: 'root_url',
+              filters_to_remove: [:terminal, :store],
+              filters_to_add: {},
+              show_null_filter_on_top: true
+            },
+            category: {
+              object_filter: true,
+              display_name: 'Select Brand Category',
+              current_value: @category,
+              values: Category.order(:name).all,
+              current_filters: @filters,
+              url_method_name: 'root_url',
+              filters_to_remove: [:terminal, :store],
+              filters_to_add: {},
+              show_null_filter_on_top: true
+            }
+          }
+        end
+
+        def breadcrumbs_configuration
+          {
+            heading: "Stock Report",
+            description: "In Stock Report",
+            links: [{name: "Home", link: user_dashboard_path, icon: 'fa-dashboard'}, 
+                      {name: "Reports", link: user_dashboard_path, icon: 'fa-calendar', active: true}]
+          }
+        end
+
+      	def set_navs
+          set_nav("reports/stock")
+        end
+
+        def render_report
+         respond_to do |format|
+          format.html {}
+          format.csv { send_data generate_csv(@results), filename: "#{params[:action]}_#{Date.today}.csv" }
+          format.pdf do
+            render :pdf => "#{@heading} (As on #{Date.today})"
+                   #:disposition => 'attachment'
+                   #:show_as_html => true
+          end
+        end
+      end
+
+      end
+    end
+  end
+end

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

@@ -80,7 +80,7 @@ module Vyapari
       private
 
       def get_collections
-        @relation = @store.stock_entries.where("")
+        @relation = @store.stock_entries.includes(:product, :supplier).where("")
 
         parse_filters
         apply_filters
@@ -130,7 +130,7 @@ module Vyapari
           collection_name: :stock_entries,
           item_name: :stock_entry,
           class: StockEntry,
-          page_title: "#{@store.name} - Stock Entries",
+          page_title: "#{@store.name} - Stock",
           js_view_path: "/kuppayam/workflows/parrot",
           view_path: "/vyapari/store_manager/stock_entries"
         }
@@ -138,7 +138,7 @@ module Vyapari
 
       def breadcrumbs_configuration
         {
-          heading: "#{@store.name} - Stock Entries",
+          heading: "#{@store.name} - Stock",
           description: "Listing all the stock at #{@store.name}",
           links: [
             {name: "Home", link: user_dashboard_path, icon: 'fa-dashboard'},

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

@@ -33,9 +33,19 @@ module Vyapari
         @invoice.assign_attributes(permitted_params)
 
         if @invoice.valid?
+
+          # Save Invoice
           @invoice.save
+
+          # Generating a real invoice number
           @invoice.generate_real_invoice_number!
+
+          # Activatingthe Invoice
           @invoice.activate!
+
+          # Updating the stock register
+          @invoice.update_stock_register!
+          
           set_notification(true, @invoice.invoice_number, "Invoice '#{@invoice.invoice_number}' SAVED")
         else
           error_message = @invoice.invoice_number || I18n.t('status.error')

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

@@ -43,6 +43,9 @@ module Vyapari
           # recalculate the gross total amount
           @invoice.reload.save
 
+          # Updating the stock register
+          @invoice.update_stock_register!
+
           set_notification(true, @line_item.product.ean_sku, "Line Item '#{@line_item.product.name}' ADDED")
         else
           if product
@@ -70,6 +73,8 @@ module Vyapari
             # recalculate the gross total amount
             @invoice.reload.save
 
+            @invoice.update_stock_register!
+
             get_collections
             set_flash_message(I18n.t('success.deleted'), :success)
             set_notification(false, I18n.t('status.success'), I18n.t('success.deleted', item: default_item_name.titleize))

data/app/models/invoice.rb

@@ -55,6 +55,7 @@ class Invoice < Vyapari::ApplicationRecord
   scope :cheque_invoices, -> { where(payment_method: CHEQUE) }
 
   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)}
   
   # ------------------
   # Instance Methods
@@ -130,6 +131,7 @@ class Invoice < Vyapari::ApplicationRecord
   #   => "active"
   def activate!
     self.update_attributes(status: ACTIVE)
+    #self.line_items.update_attributes(status: LineItem::SOLD)
   end
 
   # * Return true if the invoice is cancelled, else false.
@@ -146,7 +148,8 @@ class Invoice < Vyapari::ApplicationRecord
   #   >>> invoice.remove!
   #   => "cancelled"
   def cancel!
-    self.update_attributes(status: CANCELLED, featured: false)
+    self.update_attributes(status: CANCELLED)
+    #self.line_items.update_attributes(status: LineItem::CANCELLED)
   end
 
   # * Return true if the invoice is cash, else false.
@@ -210,6 +213,20 @@ class Invoice < Vyapari::ApplicationRecord
     #return true
   end
 
+  def update_stock_register!
+    return unless self.active?
+    self.stock_entries.destroy_all
+    self.line_items.each do |li|
+      stock_entry = StockEntry.new
+      stock_entry.store = self.store
+      stock_entry.product = li.product
+      stock_entry.invoice_id = self.id
+      stock_entry.quantity = li.quantity
+      stock_entry.status = LineItem::SOLD
+      stock_entry.save
+    end    
+  end
+
   def generate_real_invoice_number!
     self.invoice_number = "INV-#{self.terminal.code}-#{self.id}"
     self.save

data/app/models/line_item.rb

@@ -5,9 +5,10 @@ class LineItem < Vyapari::ApplicationRecord
   SOLD = "sold"
   DAMAGED = "damaged"
   RETURNED = "returned"
+  CANCELLED = "cancelled"
   
-  STATUS_HASH = {"Draft" => DRAFT, "Sold" => SOLD, "Damaged" => DAMAGED, "Returned" => RETURNED}
-  STATUS_HASH_REVERSE = {DRAFT => "Draft", SOLD => "Sold", DAMAGED => "Damaged", RETURNED => "Returned"}
+  STATUS_HASH = {"Draft" => DRAFT, "Sold" => SOLD, "Damaged" => DAMAGED, "Returned" => RETURNED, "Cancelled" => CANCELLED}
+  STATUS_HASH_REVERSE = {DRAFT => "Draft", SOLD => "Sold", DAMAGED => "Damaged", RETURNED => "Returned", CANCELLED => "Cancelled"}
 
   # Call backs
   before_save :calculate_total_amount

data/app/models/stock_entry.rb

@@ -50,6 +50,9 @@ class StockEntry < Vyapari::ApplicationRecord
   scope :reserved, -> { where(status: RESERVED) }
   scope :in_stock, -> { where(status: [ACTIVE, RECEIVED, RETURNED]) }
 
+  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)}
+
   def self.save_row_data(row)
 
     row.headers.each{ |cell| row[cell] = row[cell].to_s.strip }

data/app/models/store.rb

@@ -131,6 +131,60 @@ class Store < Vyapari::ApplicationRecord
     true
   end
 
+  def sold_items_count_for_today
+    self.stock_entries.today.sold.sum(:quantity)
+  end
+
+  def sold_items_count_for_this_month
+    self.stock_entries.this_month.sold.sum(:quantity)
+  end
+
+  def damaged_items_count_for_today
+    self.stock_entries.today.damaged.sum(:quantity)
+  end
+
+  def damaged_items_count_for_this_month
+    self.stock_entries.this_month.damaged.sum(:quantity)
+  end
+
+  def returned_items_count_for_today
+    self.stock_entries.today.returned.sum(:quantity)
+  end
+
+  def returned_items_count_for_this_month
+    self.stock_entries.this_month.returned.sum(:quantity)
+  end
+
+  def reserved_items_count_for_today
+    self.stock_entries.today.reserved.sum(:quantity)
+  end
+
+  def reserved_items_count_for_this_month
+    self.stock_entries.this_month.reserved.sum(:quantity)
+  end
+
+  def in_stock_items_count_as_of_now
+    self.stock_entries.active.sum(:quantity) - self.stock_entries.sold.sum(:quantity)
+  end
+
+  def total_no_of_products_in_stock
+    self.stock_entries.active.count 
+    # - self.stock_entries.sold.count
+    # self.stock_entries.active.count - self.stock_entries.sold.count
+    #begin
+      # result = Product.select("COUNT(products.id) as id, MAX(se.store_id) as store_id").
+      #               joins("LEFT JOIN stock_entries se ON se.product_id = products.id").
+      #               where("se.store_id = ?", self.id).
+      #               group("products.id")
+      # return result.size.to_i
+    #rescue
+      #0
+    #end
+  end
+  
+  
+  
+
   # * Return true if the brand is active, else false.
   # == Examples
   #   >>> brand.active?

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

@@ -1,15 +1,14 @@
 <%
-	total_count = @store.stock_entries.count
-	in_stock_count = @store.stock_entries.in_stock.count
-	damaged_count = @store.stock_entries.damaged.count
-	sold_count = @store.stock_entries.sold.count
-	reserved_count = @store.stock_entries.reserved.count
+	#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-list"></i>
-		<%= total_count %> <span style="font-size:20px">Product Items</span>
+		<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" %>
@@ -20,23 +19,23 @@
 <div class="row">
 	<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-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-shopping-cart"></i>
+				<i class="fa-truck"></i>
 			</div>
 			<div class="xe-label">
-			<strong class="num"><%= sold_count %></strong>
-				<span>SOLD</span>
+				<strong class="num"><%= @store.in_stock_items_count_as_of_now %></strong>
+				<span>TOTAL QUANTITY IN STOCK</span>
 			</div>
 		</div>
 
-		<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-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-truck"></i>
+				<i class="fa-shopping-cart"></i>
 			</div>
 			<div class="xe-label">
-				<strong class="num"><%= in_stock_count %></strong>
-				<span>IN STOCK</span>
+			<strong class="num"><%= @store.sold_items_count_for_today %></strong>
+				<span>ITEMS SOLD TODAY</span>
 			</div>
 		</div>
 
@@ -45,8 +44,8 @@
 				<i class="fa-ban"></i>
 			</div>
 			<div class="xe-label">
-				<strong class="num"><%= damaged_count %></strong>
-				<span>DAMAGED</span>
+				<strong class="num"><%= @store.damaged_items_count_for_today %></strong>
+				<span>ITEMS DAMAGED TODAY</span>
 			</div>
 		</div>
 
@@ -55,7 +54,7 @@
 				<i class="fa-bookmark"></i>
 			</div>
 			<div class="xe-label">
-				<strong class="num"><%= reserved_count %></strong>
+				<strong class="num"><%= @store.reserved_items_count_for_today %></strong>
 				<span>RESERVED</span>
 			</div>
 		</div>

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

@@ -0,0 +1,72 @@
+<div class="table-responsive table-scrollable">
+	<table class="table table-striped table-condensed table-bordered"> 
+		<thead>
+			<tr> 
+				<th style="text-align: center;width:60px">#</th> 
+				<th>Product Name</th>
+				<th style="width:15%;text-align: center;">EAN/SKU</th>
+				<th style="text-align: right;">PP</th>
+				<th style="text-align: right;">LP</th>
+				<th style="text-align: right;">SP</th>
+				<th style="text-align: right;">RP</th>
+				<th style="text-align: center;">Quantity</th>
+				<th>Status</th>
+				<th style="text-align: center;">Actions</th>
+			</tr> 
+		</thead>
+		<tbody> 
+			
+			<%# filters_to_add = {permalink: @current_company_group.permalink, code: @current_company.code } %>
+
+			<%# short_filters = generate_short_url_filters(@filters, filters_to_add, [:store, :terminal]) %>
+
+			<%#= link_to item.name, jobs_path(short_filters.merge(br: item.id)), target: :blank %>
+
+			<% @results.each_with_index do |item, i| %>
+				<tr> 
+					<th scope="row" style="text-align: center;"><%= i + 1 + (@per_page.to_i * (@current_page.to_i - 1)) %></th>
+					
+					<td>
+						<%= link_to item.name, "#", target: :blank %>
+					</td>
+
+					<td>
+						<%= item.ean_sku %>
+					</td>
+
+					<td style="text-align: right;"><%= number_to_currency item.purchased_price, unit: "AED " %></td>
+
+					<td style="text-align: right;"><%= number_to_currency item.landed_price, unit: "AED " %></td>
+
+					<td style="text-align: right;"><%= number_to_currency item.selling_price, unit: "AED " %></td>
+
+					<td style="text-align: right;"><%= number_to_currency item.retail_price, unit: "AED " %></td>
+
+					<td>
+						<%#= item.se_quantity %>
+					</td>
+
+					<td>
+						<%#= item.se_status %>
+					</td>
+
+				</tr>
+			<% end %>
+		</tbody> 
+		<tfoot> 
+			<% if @total && @total.first && @total.first.purchased_price %>
+				<tr>
+					<td></td>
+					<td></td>
+					<td></td>
+					<td style="font-weight: bold;text-align: right;"><%= number_to_currency @total.first.purchased_price.to_s, unit: "AED " %></td>
+					<td style="font-weight: bold;text-align: right;"><%= number_to_currency @total.first.landed_price.to_s, unit: "AED " %></td>
+					<td style="font-weight: bold;text-align: right;"><%= number_to_currency @total.first.selling_price.to_s, unit: "AED " %></td>
+					<td style="font-weight: bold;text-align: right;"><%= number_to_currency @total.first.retail_price.to_s, unit: "AED " %></td>
+					<td></td>
+					<td></td>
+				</tr>
+			<% end %>
+		</tfoot> 
+	</table>
+</div>

data/app/views/vyapari/store_manager/reports/stock/index.html.erb

@@ -0,0 +1,32 @@
+<div class="panel panel-default">
+  <div class="panel-heading">
+    Filters
+  </div>
+  <div class="panel-body">
+
+    <div id="div_report_filter_list">
+      <%#= render :partial=>"/reports/company_jpr/display_filters" %>
+      <hr>
+      <%= clear_tag(10) %>
+      <%#= render :partial=>"/reports/company_jpr/display_dropdown_filters" %>
+    </div>
+    <%= clear_tag(10) %>
+
+  </div>
+</div>
+
+<div class="panel panel-default">
+  <div class="panel-body">
+
+    <%= clear_tag(10) %>
+
+    <div id="div_report_index">
+      <%#= render :partial=>"/reports/company_jpr/chart" %>
+      <%#= clear_tag(100) %>
+      <%= render :partial=>"vyapari/store_manager/reports/stock/index" %>
+    </div>
+    <%= clear_tag(10) %>
+
+  </div>
+</div>
+

data/app/views/vyapari/store_manager/stock_entries/_index.html.erb

@@ -34,7 +34,7 @@
 
 		      <td class="stock_entry-name"><%= link_to stock_entry.product.name, store_manager_stock_entries_path(@store, stock_entry), remote: true %></td>
 
-		      <td class="stock_entry-name" style="text-align: center;"><%= link_to stock_entry.product.ean_sku, store_manager_stock_entries_path(@store, stock_entry), remote: true %></td>
+		      <td class="stock_entry-name" style="text-align: center;"><%= stock_entry.product.ean_sku %></td>
 
 		      <td class="stock_entry-name" style="text-align: right;">
 		      	<%= number_to_currency stock_entry.product.purchased_price, unit: "" %>

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

@@ -1,10 +1,10 @@
 <% 
-	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
-	cash_in_hand = @terminal.invoices.active.cash_invoices.sum(:net_total_amount)
+	active_invoices = @terminal.invoices.active.today.count
+	draft_invoices = @terminal.invoices.draft.today.count
+	active_amount = @terminal.invoices.active.today.sum(:net_total_amount)
+	draft_amount = @terminal.invoices.draft.today.sum(:net_total_amount)
+	cash_invoices = @terminal.invoices.active.today.where(payment_method: :cash).count
+	cash_in_hand = @terminal.invoices.active.today.cash_invoices.sum(:net_total_amount)
 	total_sales = 100
 %>
 
@@ -55,7 +55,7 @@
 			<div class="xe-lower">
 				<div class="border"></div>
 				
-				<span>Total Amount Billed</span>
+				<span>Total Amount Billed Today</span>
 				<strong><%= number_to_currency active_amount, unit: "AED " %></strong>
 			</div>
 		</div>

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

@@ -10,7 +10,7 @@
 
 			<div class="panel-body">
 				<!-- Active Invoices -->
-				<% active_invoices = @terminal.invoices.active.order("created_at DESC").page(1).per(10) %>
+				<% active_invoices = @terminal.invoices.active.today.order("created_at DESC").page(1).per(10) %>
 				<%= render :partial=>"vyapari/terminal_staff/dashboard/invoices", locals: { invoices: active_invoices } -%>
 			</div>
 		</div>
@@ -25,7 +25,7 @@
 
 			<div class="panel-body">
 				<!-- Draft Invoices -->
-				<% draft_invoices = @terminal.invoices.draft.order("created_at DESC").page(1).per(10) %>
+				<% draft_invoices = @terminal.invoices.draft.today.order("created_at DESC").page(1).per(10) %>
 				<%= render :partial=>"vyapari/terminal_staff/dashboard/invoices", locals: { invoices: draft_invoices } -%>
 			</div>
 			

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

@@ -52,7 +52,7 @@
 
 					<ul class="list-unstyled mt-30">
 						<li class="upper fs-20">Invoice No: <strong>#<%= @invoice.invoice_number%></strong></li>
-						<li class="mt-10">Invoice No: <%= @invoice.invoice_date.strftime("%m/%d/%Y") %></li>
+						<li class="mt-10">Invoice Date: <%= @invoice.invoice_date.strftime("%m/%d/%Y") %></li>
 						<!-- <li>Dubai</li> -->
 					</ul>
 
@@ -98,7 +98,7 @@
 			<!-- Invoice Entries -->
 			<table class="table table-bordered mt-60">
 				<thead>
-					<tr style="background-color: #4b4b4b; color:red;">
+					<tr style="">
 						<th width="10%" class="text-center">No</th>
 						<th width="40%" class="text-center">Item</th>
 						<th width="15%" class="text-center">Unit Price</th>
@@ -142,7 +142,7 @@
 
 					<% if @invoice.discount %>
 					<span class="mt-10 fs-20">
-						Discount (<%= number_to_currency @invoice.discount, unit: "%" %>): 
+						Discount (<%= @invoice.discount %>) %: 
 						<strong><%= number_to_currency @invoice.discount_amount, unit: "AED " %></strong>
 					</span>
 					<% end %>

data/config/routes.rb

@@ -56,7 +56,8 @@ Vyapari::Engine.routes.draw do
   namespace :store_manager do
 
     scope '/:store_id' do
-      get   'dashboard', to: "dashboard#index",  as: :dashboard
+      get '/dashboard', to: "dashboard#index",  as: :dashboard
+      get '/reports/stock', to: "reports/stock#index", as: :stock_report
       resources :terminals
       resources :stock_entries
       resources :stock_bundles do

data/lib/vyapari/version.rb

@@ -1,3 +1,3 @@
 module Vyapari
-  VERSION = '0.1.5dev3'
+  VERSION = '0.1.5dev4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vyapari
 version: !ruby/object:Gem::Version
-  version: 0.1.5dev3
+  version: 0.1.5dev4
 platform: ruby
 authors:
 - kpvarma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-05 00:00:00.000000000 Z
+date: 2017-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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/stock_controller.rb
 - app/controllers/vyapari/store_manager/resource_controller.rb
 - app/controllers/vyapari/store_manager/stock_bundles_controller.rb
 - app/controllers/vyapari/store_manager/stock_entries_controller.rb
@@ -437,6 +438,8 @@ files:
 - app/views/vyapari/admin/terminals/_row.html.erb
 - app/views/vyapari/admin/terminals/_show.html.erb
 - app/views/vyapari/store_manager/dashboard/index.html.erb
+- app/views/vyapari/store_manager/reports/stock/_index.html.erb
+- app/views/vyapari/store_manager/reports/stock/index.html.erb
 - app/views/vyapari/store_manager/stock_bundles/_form.html.erb
 - app/views/vyapari/store_manager/stock_bundles/_index.html.erb
 - app/views/vyapari/store_manager/stock_bundles/_row.html.erb