ish_models 0.0.33.284 → 0.0.33.286
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ish/invoice.rb +7 -2
- data/lib/wco/price.rb +3 -0
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 9858084eb2be19284f243aac721ab18d5796e734dd0ac5216a600199dde65b6e
|
4
|
+
data.tar.gz: f48ad96c4cef14657a7688090cd7415ecee6c2130cb25694897268eb6680401c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: dc070cf944df807e0c43167ba5083f1d6269778f4fa6a5dfe784467f7e671dfdceb3fc05c3536389332f16fb3be0935bf725b8f60b7311ba3b17c701ac5f266b
|
7
|
+
data.tar.gz: bb0a82434672c5aad1c941e13d5a9e6c4d118c76008d8433929bdf9636cdd8482d5e24cb34b78d180fd5bd4efe933fc2f5fd5a62cf4a53606084c178970ded66
|
data/lib/ish/invoice.rb
CHANGED
@@ -42,8 +42,13 @@ class Ish::Invoice
|
|
42
42
|
|
43
43
|
## Prawn/pdf unit of measure is 1/72"
|
44
44
|
## Canvas width: 612, height: 792
|
45
|
+
##
|
46
|
+
## tree image: 896 x 1159
|
47
|
+
## tree image: 791 x 1024
|
48
|
+
## tree image: 964 x 1248
|
49
|
+
##
|
45
50
|
def generate_monthly_invoice
|
46
|
-
tree_img_url = "#{Rails.root.join('public')}/tree
|
51
|
+
tree_img_url = "#{Rails.root.join('public')}/tree-#{number}.jpg"
|
47
52
|
wasya_co_logo_url = "#{Rails.root.join('public')}/259x66-WasyaCo-logo.png"
|
48
53
|
|
49
54
|
## canvas width: 612, height: 792
|
@@ -89,7 +94,7 @@ class Ish::Invoice
|
|
89
94
|
total = 0
|
90
95
|
leadset.subscriptions.each do |i|
|
91
96
|
subtotal = (i.price.amount_cents * i.quantity).to_f/100
|
92
|
-
lineitems_with_header.push([ i.price.product.name, i.price.
|
97
|
+
lineitems_with_header.push([ i.price.product.name, i.price.name_simple, i.quantity, subtotal ])
|
93
98
|
total += subtotal
|
94
99
|
end
|
95
100
|
|
data/lib/wco/price.rb
CHANGED