vyapari 0.1.5dev5 → 0.1.5dev6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/views/vyapari/terminal_staff/dashboard/_counts.html.erb +12 -10
- data/lib/vyapari/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 77082c9dd19cd963d7c96b8b4a43133743571513
|
|
4
|
+
data.tar.gz: 963cb3c4cb2a9bc7d43adb6e2afc4d5acfab8d39
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b41a5d12cc1a633fc218b7522d14f3842db6c33cd20af5be8bb59b7ea3e488e937b14e65aa1147b13101cf693f27f78f67e04f2f3016fa9dc2a90ea354c8c6d5
|
|
7
|
+
data.tar.gz: 3ed2aed1a6ce119c1fbd3915d5baec5d194da97321c2b5758e6ea368aeaff4e8ff66c47563ed046db6f900da495d12af6cb829b3567b6bb664d58991525ba227
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
<%
|
|
2
|
-
active_invoices = @terminal.invoices.active.
|
|
3
|
-
draft_invoices = @terminal.invoices.draft.
|
|
4
|
-
active_amount = @terminal.invoices.active.
|
|
5
|
-
draft_amount = @terminal.invoices.draft.
|
|
6
|
-
cash_invoices = @terminal.invoices.active.
|
|
7
|
-
|
|
2
|
+
active_invoices = @terminal.invoices.active.count
|
|
3
|
+
draft_invoices = @terminal.invoices.draft.count
|
|
4
|
+
active_amount = @terminal.invoices.active.sum(:net_total_amount)
|
|
5
|
+
draft_amount = @terminal.invoices.draft.sum(:net_total_amount)
|
|
6
|
+
cash_invoices = @terminal.invoices.active.where(payment_method: :cash).count
|
|
7
|
+
credit_card_invoices = @terminal.invoices.active.where(payment_method: :credit_card).count
|
|
8
|
+
cash_in_hand = @terminal.invoices.active.cash_invoices.sum(:net_total_amount)
|
|
9
|
+
credit_card_amount = @terminal.invoices.active.credit_card_invoices.sum(:net_total_amount)
|
|
8
10
|
total_sales = 100
|
|
9
11
|
%>
|
|
10
12
|
|
|
@@ -47,16 +49,16 @@
|
|
|
47
49
|
<i class="fa-floppy-o"></i>
|
|
48
50
|
</div>
|
|
49
51
|
<div class="xe-label">
|
|
50
|
-
<strong class="num"><%=
|
|
51
|
-
<span>
|
|
52
|
+
<strong class="num"><%= number_to_currency credit_card_amount, unit: "AED " %></strong>
|
|
53
|
+
<span>Total CC AMount</span>
|
|
52
54
|
</div>
|
|
53
55
|
|
|
54
56
|
</div>
|
|
55
57
|
<div class="xe-lower">
|
|
56
58
|
<div class="border"></div>
|
|
57
59
|
|
|
58
|
-
<span>Total Amount Billed Today</span>
|
|
59
|
-
<strong
|
|
60
|
+
<!-- <span>Total Amount Billed Today</span> -->
|
|
61
|
+
<!-- <strong><%#= number_to_currency active_amount, unit: "AED " %></strong> -->
|
|
60
62
|
</div>
|
|
61
63
|
</div>
|
|
62
64
|
</div>
|
data/lib/vyapari/version.rb
CHANGED