vyapari 0.1.5dev1 → 0.1.5dev2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73bb587bba890a79649d9d35566eff3802b531ea
-  data.tar.gz: 59d85c9e78a2697b447048dbc7752ecc11b87443
+  metadata.gz: 26391418ff6989a5ef96182b0ff1dac526126b24
+  data.tar.gz: c8157ae3c52ec6f1cf588795b3bfa8e613ee6678
 SHA512:
-  metadata.gz: 7eac782695ed124c384b61de704a564da787ea85b0150a2f5aad45000c7ec7c179cc471e32e1ce246d2c1bfc1ff3c57babde90339275efa4cbbbe57d2f910384
-  data.tar.gz: 319b211cacaafad288b43b34239a1177d69e46e71c87c363cf684ea7f1f823a7ba0bd364aa5a21db6d49d11adc6ef9246cb72fc1b2a470da9c1c68fcbab47f5d
+  metadata.gz: 5c93cdca3ac288aa6d4ebf21f5fe9e2d3284ee974262398599f75636fadf452773f33eb044711499b7920bc3e1ab25c7639e9adf05b3ee071f530560951c057c
+  data.tar.gz: 2d4b0e96ddd78cb2dfefbfb6395f335bf7ca91aad861f3cdca6a2d73970112c0a334fb4ca656ad6709f0389cbd097849ce0a2ff82bcea3cac224080838432d28

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

@@ -19,7 +19,6 @@ module Vyapari
           set_flash_message(text, :error, false) if defined?(flash) && flash
           redirect_to default_redirect_url_after_sign_in
         end
-        #binding.pry
       end
       
     end	

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

@@ -2,7 +2,7 @@ module Vyapari
 	module TerminalStaff
 	  class InvoicesController < Vyapari::TerminalStaff::ResourceController
 
-      #layout :resolve_layout
+      layout :resolve_layout
 
 	  	def new
         @invoice = @r_object = Invoice.new
@@ -18,11 +18,12 @@ module Vyapari
 
       def edit
         @invoice = @r_object = Invoice.find_by_id(params[:id])
-        render_show
+        render :new
       end
 
       def show
         @invoice = @r_object = Invoice.find_by_id(params[:id])
+        render :show
       end
 
       def update
@@ -46,7 +47,7 @@ module Vyapari
 	    private
 
       def permitted_params
-        params.require(:invoice).permit(:discount, :adjustment, :money_taken, :notes, :payment_method, :customer_name, :customer_address, :credit_card_number)
+        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

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

@@ -6,8 +6,9 @@ module Vyapari
 
 	  	def create
 
-        ean_sku = permitted_params[:product_id]
-        product = Product.where("ean_sku = ?", permitted_params[:product_id]).first
+        ean_sku = permitted_params[:product_id].to_s
+
+        product = Product.where("ean_sku = ? ", ean_sku).first
 
         product_in_stock = false
 
@@ -35,12 +36,13 @@ module Vyapari
 
         @r_object = @line_item
 
-        binding.pry
-
         if @line_item.errors.blank?
+          
           @line_item.save
-          # recalculate the total amount
-          @invoice.save
+          
+          # recalculate the gross total amount
+          @invoice.reload.save
+
           set_notification(true, @line_item.product.ean_sku, "Line Item '#{@line_item.product.name}' ADDED")
         else
           if product
@@ -64,9 +66,14 @@ module Vyapari
         if @r_object
           if @r_object.can_be_deleted?
             @r_object.destroy
+            
+            # recalculate the gross total amount
+            @invoice.reload.save
+
             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))
+            
             @destroyed = true
           else
             message = I18n.t('errors.failed_to_delete', item: default_item_name.titleize)

data/app/models/invoice.rb

@@ -14,7 +14,7 @@ class Invoice < Vyapari::ApplicationRecord
   STATUS_HASH_REVERSE = {DRAFT => "Draft", ACTIVE => "Active", CANCELLED => "Cancelled"}
 
   # Call backs
-  before_save :calculate_total_amount
+  before_save :calculate_gross_total_amount
 
   # Validations
   validates :invoice_number, :presence=> true
@@ -49,6 +49,11 @@ class Invoice < Vyapari::ApplicationRecord
   scope :active, -> { where(status: ACTIVE) }
   scope :cancelled, -> { where(status: CANCELLED) }
 
+  scope :cash_invoices, -> { where(payment_method: CASH) }
+  scope :credit_invoices, -> { where(payment_method: CREDIT) }
+  scope :credit_card_invoices, -> { where(payment_method: CREDIT_CARD) }
+  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) }
   
   # ------------------
@@ -58,9 +63,11 @@ class Invoice < Vyapari::ApplicationRecord
   def initialize
     super
     self.discount = 0.00
+    self.tax = 0.00
     self.adjustment = 0.00
     self.money_taken = 0.00
-    self.total_amount = 0.00
+    self.gross_total_amount = 0.00
+    self.net_total_amount = 0.00
   end
 
   def display_name
@@ -208,16 +215,19 @@ class Invoice < Vyapari::ApplicationRecord
     self.save
   end
 
-  def net_total_amount
-    self.total_amount - self.discount
+  def discount_amount
+    self.gross_total_amount * (self.discount / 100.00)
   end
 
   def balance_to_give
     self.money_taken - self.net_total_amount
   end
 
-  def calculate_total_amount
-    self.total_amount = self.line_items.sum("rate * quantity") || 0.0
+  def calculate_gross_total_amount
+    self.gross_total_amount = self.line_items.sum("rate * quantity") || 0.0
+    total_after_discount_and_tax = self.gross_total_amount - ( self.discount / 100.00  * self.gross_total_amount) + ( self.tax / 100.00  * self.gross_total_amount)
+    self.net_total_amount = total_after_discount_and_tax.round(2)
+    self.adjustment = self.net_total_amount - total_after_discount_and_tax
   end
   
 end

data/app/models/product.rb

@@ -61,7 +61,7 @@ class Product < Vyapari::ApplicationRecord
     product.name = row[:name]
     product.one_liner = row[:one_liner]
     product.description = row[:description]
-    product.ean_sku = row[:ean_sku]
+    product.ean_sku = row[:ean_sku].to_s
     product.reference_number = row[:reference_number]
 
     product.brand = Brand.find_by_name(row[:brand])

data/app/models/store.rb

@@ -95,7 +95,8 @@ class Store < Vyapari::ApplicationRecord
   # ------------------
 
   def display_name
-    self.country ? "#{self.code_was}-#{self.name_was}, #{self.country.name}" : "#{self.code_was}-#{self.name_was}"
+    #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 display_store_type

data/app/views/vyapari/store_manager/stock_bundles/_form.html.erb

@@ -3,42 +3,6 @@
 
 <%= form_for([:store_manager, @stock_bundle], :html => {:id=>"form_stock_bundle", :class=>"mb-0 form-horizontal", :stock_bundle => "form", :method => (@stock_bundle.new_record? ? :post : :put), multipart: true, :target => "iframe_document"}) do |f| %>
 
-      <div class="dx-warning mt-20" role="alert">
-        <p>
-          A <strong>Stock bundle</strong> is a collection of stock items you receive from a particular Supplier. To make it work for different suppliers, you should convert the excel / csv file you have received from the supplier to a common format so that the system undersand it.
-
-          <br><br>
-          <strong>Click here to view the 
-          <%= link_to "Exmaple File", sample_file_link, target: "_blank" %>
-          format the system is expecting </strong>
-          <br><br>
-
-          The status of the Job Bunde will be <span class="ml-5 mt-5 label label-white">Pending</span> by default. You can verify it once again after uploading and can change the status to <span class="ml-5 mt-5 label label-success">Approved</span>. However, the system will not allow you to approve if it has any error. The error will be populated in an error file which the system will generate after parsing the uploaded file. It will be available for you to download once it is ready.
-
-          <br></br>
-
-          <span class="ml-5 mt-5 label label-danger">Pending</span> Stocks are not included in the reports and not shown on invoice line items.</li>
-            <li>You click on edit button in the list view against each stock bundle and reupload the corrected CSV file after rectifying the errors the system has pointed out.
-
-          <br></br>
-
-          <b>POINTS TO NOTE:</b>
-          <ul>
-            <li>Convert your .xlsx or .xls files to CSV format. You can do this easily with <b>Save As</b> Option in Microsoft Excel.</li>
-            
-            <li>Create one <b>FILE</b> for one <b>SUPPLIER</b>.</li>
-
-            <li>CSV files can be created with Excel. However, do not use sheets / tabs as CSV has only one sheet always.</li>
-            
-            <li>Upload one CSV file at a time (one each for a Supplier / Store combination).</li>
-            
-          </ul>
-
-          <%= link_to(raw("<i class='fa fa-download mr-10'></i> Download the Sample CSV File"), sample_file_link, class: "btn btn-primary btn-only-hover", target: "_blank") %>
-
-        </p>
-      </div>
-
       <% unless @stock_bundle.new_record? %>
         <div class="alert alert-danger alert-dismissible mt-20 hidden" role="alert">
           <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -63,6 +27,10 @@
 
       <div class="form-inputs mb-30 mt-30">
         
+        <%= theme_form_field(@stock_bundle, :name) %>
+
+        <%= theme_form_field(@stock_bundle, :file, html_options: {type: 'file'}, label: "Upload the Stock file in CSV format", param_name: "stock_bundle[file]") %>
+
         <% if @stock_bundle && @stock_bundle.persisted? %>
           
           <%= theme_form_group("Supplier", required: false, error_class: "error") do %>
@@ -77,11 +45,43 @@
           <%= theme_form_assoc_group(@stock_bundle, :supplier_id, **options) %>
           
         <% end %>
+        
+      </div>
 
-        <%= theme_form_field(@stock_bundle, :name) %>
+      <div class="dx-warning mt-20" role="alert">
+        <p>
+          A <strong>Stock bundle</strong> is a collection of stock items you receive from a particular Supplier. To make it work for different suppliers, you should convert the excel / csv file you have received from the supplier to a common format so that the system undersand it.
 
-        <%= theme_form_field(@stock_bundle, :file, html_options: {type: 'file'}, label: "Upload the Stock file in CSV format", param_name: "stock_bundle[file]") %>
-        
+          <br><br>
+          <strong>Click here to view the 
+          <%= link_to "Exmaple File", sample_file_link, target: "_blank" %>
+          format the system is expecting </strong>
+          <br><br>
+
+          The status of the Job Bunde will be <span class="ml-5 mt-5 label label-white">Pending</span> by default. You can verify it once again after uploading and can change the status to <span class="ml-5 mt-5 label label-success">Approved</span>. However, the system will not allow you to approve if it has any error. The error will be populated in an error file which the system will generate after parsing the uploaded file. It will be available for you to download once it is ready.
+
+          <br></br>
+
+          <span class="ml-5 mt-5 label label-danger">Pending</span> Stocks are not included in the reports and not shown on invoice line items.</li>
+            <li>You click on edit button in the list view against each stock bundle and reupload the corrected CSV file after rectifying the errors the system has pointed out.
+
+          <br></br>
+
+          <b>POINTS TO NOTE:</b>
+          <ul>
+            <li>Convert your .xlsx or .xls files to CSV format. You can do this easily with <b>Save As</b> Option in Microsoft Excel.</li>
+            
+            <li>Create one <b>FILE</b> for one <b>SUPPLIER</b>.</li>
+
+            <li>CSV files can be created with Excel. However, do not use sheets / tabs as CSV has only one sheet always.</li>
+            
+            <li>Upload one CSV file at a time (one each for a Supplier / Store combination).</li>
+            
+          </ul>
+
+          <%= link_to(raw("<i class='fa fa-download mr-10'></i> Download the Sample CSV File"), sample_file_link, class: "btn btn-primary btn-only-hover", target: "_blank") %>
+
+        </p>
       </div>
     
       <div>

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(:total_amount)
-	draft_amount = @terminal.invoices.draft.sum(:total_amount)
+	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 = 100
+	cash_in_hand = @terminal.invoices.active.cash_invoices.sum(:net_total_amount)
 	total_sales = 100
 %>
 

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

@@ -4,7 +4,7 @@
 			<tr> 
 				<th>Invoice Number</th>
 				<th>Customer</th>
-				<th>Date</th>
+				<!-- <th>Date</th> -->
 				<th style="text-align: right;">Total Amount</th>
 			</tr> 
 		</thead>
@@ -14,14 +14,19 @@
 	  		
 	  		<tr id="tr_invoice_<%= invoice.id %>">
 		      
-		      <td class="invoice-name"><%= link_to invoice.invoice_number, terminal_staff_invoice_path(@terminal, invoice), remote: true %></td>
+		      <% customer_name = invoice.customer_name || "GUEST-#{invoice.id}-#{@store.code}-" %>
 
-		      <% customer_name = invoice.customer_name || "CUST-#{invoice.id}" %>
-		      <td class="invoice-name"><%= link_to customer_name, terminal_staff_invoice_path(@terminal, invoice), remote: true %></td>
+	  			<% 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>
+		  		<% 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>
+		  		<% end %>
 
-		      <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;"><%#= invoice.invoice_date.strftime("%m/%d/%Y") if invoice.invoice_date %></td> -->
 
-		      <td class="invoice-name" style="text-align: center;"><%= number_to_currency invoice.total_amount, unit: "" %></td>
+		      <td class="invoice-name" style="text-align: center;"><%= number_to_currency invoice.net_total_amount, unit: "" %></td>
 
 		    </tr>
 		  <% end %>

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

@@ -2,7 +2,7 @@
 
 <div class="row">
 	<div class="col-md-6">
-		<div class="panel panel-color panel-blue">
+		<div class="panel panel-color panel-gray">
 
 			<div class="panel-heading">
 				<h3 class="panel-title">Saved Invoices</h3>

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

@@ -29,11 +29,11 @@
 
 	  <div class="col-md-3 col-sm-12 col-xs-12">
 
-	  	<% print_link = edit_terminal_staff_invoice_path(@terminal, @invoice) %>
+	  	<% print_link = terminal_staff_invoice_path(@terminal, @invoice) %>
 			
 			<% delete_link = terminal_staff_invoice_path(@terminal, @invoice) %>
 
-			<%= link_to raw("<i class=\"fa-print\"></i> Print Invoice"), print_link, :remote=>true, class: "btn btn-block btn-white" if @invoice.active? %>
+			<%= link_to raw("<i class=\"fa-print\"></i> Print Invoice"), print_link, target: "_blank", class: "btn btn-block btn-white" if @invoice.active? %>
 
 	    <%= link_to raw("<i class=\"linecons-trash\"></i> Delete"), delete_link, method: :delete, invoice: "menuitem", tabindex: "-1", data: { confirm: 'Are you sure?' }, :remote=>true, class: "btn btn-block btn-danger btn-only-hover" if @invoice.can_be_deleted? %>
 

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

@@ -29,6 +29,20 @@
             </div>
           </div>
 
+          <div class="row mt-10 mb-10">
+            <div class="col-md-4">Customer Phone:</div>
+            <div class="col-md-8">
+              <%= f.text_field(:customer_phone, style: "width:100%;") %>
+            </div>
+          </div>
+
+          <div class="row mt-10 mb-10">
+            <div class="col-md-4">Customer Email:</div>
+            <div class="col-md-8">
+              <%= f.text_field(:customer_email, style: "width:100%;") %>
+            </div>
+          </div>
+
           <div class="row mt-10 mb-10">
             <div class="col-md-4">Payment Method:</div>
             <div class="col-md-8">
@@ -53,7 +67,7 @@
           <div class="row mt-10 mb-10">
             <div class="col-md-4">Credit Card Number:</div>
             <div class="col-md-8">
-              <%= f.text_field(:customer_name, style: ";width:100%;") %>
+              <%= f.text_field(:credit_card_number, style: ";width:100%;") %>
             </div>
           </div>
 
@@ -74,7 +88,7 @@
         <div class="col-md-6">
           
           <div class="row mt-10 mb-10">
-            <div class="col-md-4 col-md-offset-2">Discount:</div>
+            <div class="col-md-4 col-md-offset-2">Discount (%):</div>
             <div class="col-md-4">
               <%= f.text_field(:discount, style: "text-align: right;width:100%;") %>
             </div>

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

@@ -38,7 +38,7 @@
 
 		      <td class="invoice-name" style="text-align: center;"><%= invoice.display_payment_method %></td>
 
-		      <td class="invoice-name" style="text-align: center;"><%= number_to_currency invoice.total_amount, unit: "" %></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;"><%= invoice.display_status %></td>
 

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

@@ -18,7 +18,7 @@
 
   <td class="invoice-name" style="text-align: center;"><%= @invoice.user.display_payment_method %></td>
 
-  <td class="invoice-name" style="text-align: center;"><%= number_to_currency invoice.total_amount, unit: "" %></td>
+  <td class="invoice-name" style="text-align: center;"><%= number_to_currency invoice.net_total_amount, unit: "" %></td>
 
   <td class="invoice-name"><%= invoice.display_status %></td>
 

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

@@ -1,171 +1,204 @@
-<div class="panel panel-default">
-				<div class="panel-heading hidden-print">Invoice</div>
-				<div class="panel-body">
+<style type="text/css">
+	@media print {
+		.body { font-size: 16px; }
+		.invoice-header { font-size: 18px; }
+		
+	}
+</style>
+
+<div class="panel panel-default" style="width:100%;">
+	<div class="panel-heading hidden-print">
+		<strong>#<%= @invoice.invoice_number %></strong>
+	</div>
+	<div class="panel-body">
+
+		<section class="invoice-env">
+
+			<!-- Invoice header -->
+			<div class="invoice-header" style="font-size:16px;">
+
+				<!-- Invoice Options Buttons -->
+				<div class="invoice-options hidden-print">
 					
-					<section class="invoice-env">
+					<% if request.xhr?  %>
+
+
+						<%= link_to edit_terminal_staff_invoice_path(@terminal, @invoice), remote: true, class: "btn btn-block btn-secondary btn-icon btn-icon-standalone btn-icon-standalone-right text-left" do %>
+							<i class="fa-envelope-o"></i>
+							<span>Edit</span>
+						<% end %>
+
+						<%= link_to terminal_staff_invoice_path(@terminal, @invoice), class: "btn btn-block btn-gray btn-icon btn-icon-standalone btn-icon-standalone-right btn-single text-left", target: "_blank" do %>
+							<i class="fa-print"></i>
+							<span>Preview</span>
+						<% end %>
+
+					<% else %>
+
+						<%= link_to "#", class: "btn btn-block btn-secondary btn-icon btn-icon-standalone btn-icon-standalone-right btn-single text-left", onclick: "window.print();" do %>
+							<i class="fa-print"></i>
+							<span>Print</span>
+						<% end %>
+
+					<% end %>
+				</div>
+
+				<!-- Invoice Data Header -->
+				<div class="invoice-logo">
+
+					<a href="#" class="logo">
+					<img src="/assets/kuppayam/logo.png" class="img-responsive" width="200" />
+					</a>
+
+					<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>Dubai</li> -->
+					</ul>
+
+				</div>
+
+			</div>
+
+
+			<!-- Client and Payment Details -->
+			<div class="invoice-details">
+
+				<div class="invoice-client-info">
 					
-						<!-- Invoice header -->
-						<div class="invoice-header">
-							
-							<!-- Invoice Options Buttons -->
-							<div class="invoice-options hidden-print">
-								<a href="#" class="btn btn-block btn-gray btn-icon btn-icon-standalone btn-icon-standalone-right text-left">
-									<i class="fa-envelope-o"></i>
-									<span>Send</span>
-								</a>
-								
-								<a href="#" class="btn btn-block btn-secondary btn-icon btn-icon-standalone btn-icon-standalone-right btn-single text-left">
-									<i class="fa-print"></i>
-									<span>Print</span>
-								</a>
-							</div>
-							
-							<!-- Invoice Data Header -->
-							<div class="invoice-logo">
-							
-								<a href="#" class="logo">
-									<img src="assets/images/logo-white-bg.png" class="img-responsive" />
-								</a>
-								
-								<ul class="list-unstyled">
-									<li class="upper">Invoice No. <strong>#5652256</strong></li>
-									<li>06 December 14</li>
-									<li>Prishtin&euml;, Kosovo</li>
-								</ul>
-								
-							</div>
-							
-						</div>
-						
-						
-						<!-- Client and Payment Details -->
-						<div class="invoice-details">
-							
-							<div class="invoice-client-info">
-								<strong>Client</strong>
-								
-								<ul class="list-unstyled">
-									<li>John Doe </li>
-									<li>Mr Nilson Otto </li>
-									<li>FoodMaster Ltd</li>
-								</ul>
-								
-								<ul class="list-unstyled">		
-									<li>1982 OOP </li>
-									<li>Madrid, Spain </li>
-									<li>+1 (151) 225-4183</li>
-								</ul>
-							</div>
-							
-							<div class="invoice-payment-info">
-								<strong>Payment Details</strong>
-								
-								<ul class="list-unstyled">
-									<li>V.A.T Reg #: <strong>542554(DEMO)78</strong></li>
-									<li>Account Name: <strong>FoodMaster Ltd</strong> </li>
-									<li>SWIFT code: <strong>45454DEMO545DEMO</strong></li>
-								</ul>
-							</div>
-							
-						</div>
-						
-						
-						<!-- Invoice Entries -->
-						<table class="table table-bordered">
-							<thead>
-								<tr class="no-borders">
-									<th class="text-center hidden-xs">#</th>
-									<th width="60%" class="text-center">Product</th>
-									<th class="text-center hidden-xs">Quantity</th>
-									<th class="text-center">Price</th>
-								</tr>
-							</thead>
-							
-							<tbody>
-								<tr>
-									<td class="text-center hidden-xs">1</td>
-									<td>On am we offices expense thought</td>
-									<td class="text-center hidden-xs">1</td>
-									<td class="text-right text-primary text-bold">$1,290</td>
-								</tr>
-								
-								<tr>
-									<td class="text-center hidden-xs">2</td>
-									<td>Up do view time they shot</td>
-									<td class="text-center hidden-xs">1</td>
-									<td class="text-right text-primary text-bold">$400</td>
-								</tr>
-								
-								<tr>
-									<td class="text-center hidden-xs">3</td>
-									<td>Way ham unwilling not breakfast</td>
-									<td class="text-center hidden-xs">1</td>
-									<td class="text-right text-primary text-bold">$550</td>
-								</tr>
-								
-								<tr>
-									<td class="text-center hidden-xs">4</td>
-									<td>Songs to an blush woman be sorry</td>
-									<td class="text-center hidden-xs">1</td>
-									<td class="text-right text-primary text-bold">$4020</td>
-								</tr>
-								
-								<tr>
-									<td class="text-center hidden-xs">5</td>
-									<td>Luckily offered article led lasting</td>
-									<td class="text-center hidden-xs">1</td>
-									<td class="text-right text-primary text-bold">$87</td>
-								</tr>
-								
-								<tr>
-									<td class="text-center hidden-xs">6</td>
-									<td>Of as by belonging therefore suspicion</td>
-									<td class="text-center hidden-xs">1</td>
-									<td class="text-right text-primary text-bold">$140</td>
-								</tr>
-							</tbody>
-						</table>
-						
-						<!-- Invoice Subtotals and Totals -->
-						<div class="invoice-totals">
-							
-							<div class="invoice-subtotals-totals">
-								<span>
-									Sub - Total amount: 
-									<strong>$6,487</strong>
-								</span>
-								
-								<span>
-									VAT: 
-									<strong>12.9%</strong>
-								</span>
-								
-								<span>
-									Discount: 
-									<strong>-----</strong>
-								</span>
-								
-								<hr />
-								
-								<span>
-									Grand Total: 
-									<strong>$7,304</strong>
-								</span>
-							</div>
-							
-							<div class="invoice-bill-info">
-								<address>
-									795 Park Ave, Suite 120<br />
-									San Francisco, CA 94107<br /> 
-									P: (234) 145-1810 <br />
-									Full Name <br />
-									<a href="#">first.last@email.com</a>
-								</address>
-							</div>
-							
-						</div>
-						
-					</section>
+					<% if @invoice.customer_name %>
+					
+					<strong>Customer Info</strong>
+					<ul class="list-unstyled">
+						<li><%= @invoice.customer_name %></li>
+						<li><%= @invoice.customer_phone %></li>
+					</ul>
+					<% end %>
+
+					<ul class="list-unstyled">		
+						<li><%= @invoice.customer_email %></li>
+						<li><%= @invoice.customer_address %></li>
+					</ul>
+				</div>
+
+				<div class="invoice-payment-info" style="text-align: left">
+					<strong>Payment Details</strong>
+
+					<ul class="list-unstyled">
+						<li>Payment Method: <strong><%= @invoice.display_payment_method %></strong></li>
+						<% if @invoice.credit_card? %>
+							<li>Credit Card Number: <strong><%= @invoice.credit_card_number %></strong> </li>
+						<% end %>
+					</ul>
+				</div>
+
+			</div>
+
+
+			<!-- Invoice Entries -->
+			<table class="table table-bordered mt-60">
+				<thead>
+					<tr style="background-color: #4b4b4b; color:red;">
+						<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>
+						<th width="15%" class="text-center">Quantity</th>
+						<th width="20%" class="text-center">Price</th>
+					</tr>
+				</thead>
+
+				<tbody>
+					<% @invoice.line_items.each_with_index do |line_item, i| %>
+						<tr>
+							<td class="text-center">
+								<%= i + 1 + (@per_page.to_i * (@current_page.to_i - 1)) %>
+							</td>
+							<td><%= line_item.product.display_name %></td>
+							<td class="text-center">
+								<%= number_to_currency line_item.product.retail_price, unit: "AED " %>
+							<td class="text-center"><%= line_item.quantity %></td>
+							<td class="text-right text-primary text-bold"><%= number_to_currency line_item.total_amount, unit: "AED " %></td>
+						</tr>
+					<% end %>
 					
+				</tbody>
+			</table>
+
+			<!-- Invoice Subtotals and Totals -->
+			<div class="invoice-totals mt-40">
+
+				<div class="invoice-subtotals-totals">
+					<span class="mt-10 fs-20">
+						Total Amount: 
+						<strong><%= number_to_currency @invoice.gross_total_amount, unit: "AED " %></strong>
+					</span>
+
+					<% if @invoice.tax > 0.00 %>
+						<span class="mt-10 fs-20">
+							Tax: 
+							<strong><%= number_to_currency @invoice.tax, unit: "" %></strong>
+						</span>
+					<% end %>
+
+					<% if @invoice.discount %>
+					<span class="mt-10 fs-20">
+						Discount (<%= number_to_currency @invoice.discount, unit: "%" %>): 
+						<strong><%= number_to_currency @invoice.discount_amount, unit: "AED " %></strong>
+					</span>
+					<% end %>
+
+					<hr />
+
+					<span class="mt-10 fs-20">
+						Net Total: 
+						<strong><%= number_to_currency @invoice.net_total_amount, unit: "AED " %></strong>
+					</span>
+				</div>
+
+				<div class="invoice-bill-info">
+					<address>
+						<strong>SELAYIA INVESTMENT</strong><br />
+						P O BOX: 63995, Dubai, U.A.E<br /> 
+						<!-- Office #505, Sama Tower<br />
+						Sheikh Zayed Road<br />  -->
+						P: +971 4 355 9333 <br />
+						F: +971 4 355 0365 <br />
+						 <br />
+					</address>
+				</div>
+
+			</div>
+
+			<hr />
+
+			<!-- Invoice header -->
+			<div class="invoice-footer fs-12 lh-20 mt-40">
+
+				<!-- Invoice Data Header -->
+				<div class="terminal_info" style="float:left;width:40%">
+
+					<ul class="list-unstyled">
+						<li class="upper">Terminal: <%= @terminal.display_name %></li>
+						<li class="upper">Store: <%= @store.display_name %></li>
+						<li>Timestamp: <%= @invoice.invoice_date.strftime("%m/%d/%Y - %H:%M:%S") %></li>
+						<li>Sales Staff: <%= @invoice.user.display_name %></li>
+					</ul>
+
+				</div>
+
+				<div class="terms_and_conditions" style="float:right;width:60%">
+
+					<strong>Terms & Conditions</strong> <br>
+
+					There is no refund for items sold. <br>
+					The items sold may be exchanged until end of the event upon producing the original invoice.
+
 				</div>
+
+				<div class="clearfix"></div>
+			</div>
+
+		</section>
+
+	</div>
 </div>

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

@@ -11,3 +11,6 @@
   notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
 
 <% end %>
+
+// Set the mouse focus on the EAN input field
+$( "#div_line_item_form .li-item-name input").focus().select();

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

@@ -0,0 +1,13 @@
+<% if @invoice %>
+	
+	// Show the details in the large modal
+	var heading = "<%= raw @invoice.try(:invoice_number) %>";
+	var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/show")) %>";
+	showLargeModal(heading, bodyContent, false);
+
+<% else %>
+
+	// Showing Growl Like Message
+  notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
+
+<% end %>

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

@@ -48,6 +48,8 @@
 
 <% @invoice.line_items.each_with_index do |line_item, i| %>
 	
+	<% next unless line_item.persisted? %>
+	
 	<div class="row ili" id="div_line_item_<%= line_item.id %>">
 
 		<%# edit_link = edit_terminal_staff_invoice_line_item_path(@invoice, line_item, terminal_id: @terminal.id) %>
@@ -87,7 +89,7 @@
 <div class="row mt-10 mb-10" style="font-weight: bold;">
   <div class="col-md-2 col-md-offset-7">Gross Total:</div>
   <div class="col-md-2" style="text-align: right">
-  	<%= number_to_currency @invoice.total_amount, unit: "" %>
+  	<%= number_to_currency @invoice.gross_total_amount, unit: "AED " %>
   </div>
 </div>
 

data/app/views/vyapari/terminal_staff/line_items/create.js.erb

@@ -22,13 +22,13 @@
   <% error_message = content_tag(:div, raw(@notification[:message]), class: "alert alert-danger mt-20") %>
   $("#invoice_form_error").html("<%= escape_javascript(error_message) %>");
   $("#invoice_form_error").show();
-
-  // Set the mouse focus on the EAN input field
-  $( "#div_line_item_form .li-item-name input").focus().select();
   
   // Showing Growl Like Message
   notifyError("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(raw(@notification[:message])) %>");
 
 <% end %>
 
+// Set the mouse focus on the EAN input field
+$( "#div_line_item_form .li-item-name input").focus().select();
+
 

data/app/views/vyapari/terminal_staff/line_items/destroy.js.erb

@@ -1,7 +1,7 @@
 <% if @destroyed %>
   
   // Removing the item from the list
-  $('#div_<%= @resource_options[:item_name] %>_<%= @r_object.id %>').remove();
+  $("#div_line_item_index").html("<%= escape_javascript(render(:partial=>"/vyapari/terminal_staff/line_items/index")) %>");
   $("#div_invoice_form").html("<%= escape_javascript(render(:partial=>"/vyapari/terminal_staff/invoices/form")) %>");
 
   // Hide errors

data/app/views/vyapari/user_dashboard/index.html.erb

@@ -1,4 +1,4 @@
-<% @stores = Store.active_and_inactive.all + Store.active_and_inactive.all %>
+<% @stores = Store.active_and_inactive.all %>
 
 <h1 class="mb-40" style="text-align:center;color:#4b4b4b;">Welcome <strong><%= @current_user.name %></strong></h1>
 

data/db/migrate/20170000000213_create_invoices.rb

@@ -7,10 +7,14 @@ class CreateInvoices < ActiveRecord::Migration[5.0]
 
       t.string :customer_name
       t.string :customer_address
+      t.string :customer_phone
+      t.string :customer_email
 
-      t.integer :discount
+      t.decimal :discount
       t.decimal :tax
-      t.decimal :total_amount
+      t.decimal :gross_total_amount
+      t.decimal :net_total_amount
+      t.decimal :adjustment
 
       t.text :notes
 
@@ -18,7 +22,6 @@ class CreateInvoices < ActiveRecord::Migration[5.0]
       t.string :payment_method, :null => false, :default=>"cash", :limit=>16
 
       # If Cash
-      t.decimal :adjustment
       t.decimal :money_taken
 
       # If Cheque

data/lib/vyapari/version.rb

@@ -1,3 +1,3 @@
 module Vyapari
-  VERSION = '0.1.5dev1'
+  VERSION = '0.1.5dev2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vyapari
 version: !ruby/object:Gem::Version
-  version: 0.1.5dev1
+  version: 0.1.5dev2
 platform: ruby
 authors:
 - kpvarma
@@ -461,11 +461,11 @@ files:
 - app/views/vyapari/terminal_staff/invoices/index.html.erb
 - app/views/vyapari/terminal_staff/invoices/new.js.erb
 - app/views/vyapari/terminal_staff/invoices/show.html.erb
+- app/views/vyapari/terminal_staff/invoices/show.js.erb
 - app/views/vyapari/terminal_staff/line_items/_form.html.erb
 - app/views/vyapari/terminal_staff/line_items/_index.html.erb
 - app/views/vyapari/terminal_staff/line_items/create.js.erb
 - app/views/vyapari/terminal_staff/line_items/destroy.js.erb
-- app/views/vyapari/terminal_staff/stores/index.html.erb
 - app/views/vyapari/user_dashboard/index.html.erb
 - config/routes.rb
 - db/import_data/brands.csv

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

@@ -1,24 +0,0 @@
-<div class="row">
-
-	<% @stores.each do |store| %>
-	<div class="col-sm-4">
-		<div class="xe-widget xe-counter xe-counter-info" style="min-height:160px;max-height: 160px;overflow:hidden;">
-			<div class="xe-icon">
-				<i class="fa fa-building-o"></i>
-			</div>
-			<div class="xe-label">
-				<strong class="num"><%= store.code %></strong>
-				<span><%= store.name %></span>
-				<hr>
-				<div class="mt-10"></div>
-				<%= link_to "Dashboard", store_manager_dashboard_path(store) %>
-				<!-- <div class="mt-5"></div> -->
-				<%#= link_to "Manage Stock", store_manager_stock_entries_path(store) %>
-				<div class="mt-5"></div>
-				<%= link_to "Upload new Stock", store_manager_stock_bundles_path(store) %>
-			</div>
-		</div>
-	</div>
-	<% end %>
-
-</div>