comee_core 0.3.53 → 0.3.54
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/comee/core/purchase_order.rb +4 -6
- data/lib/comee/core/version.rb +1 -1
- 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: d2d04be0ca8cae11e80be3250dc260b6aa796522078752c612739ad31466f86f
|
4
|
+
data.tar.gz: da0e081ec0f4c573ab032f11e5ee394feeebc99ca5b18d074d1b8af9e547d878
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d7a5097468dfaa5751480e116f6404d3df56615172fe20e5c337ab5868fec09a7fb4a7365a407eba822289cfcb9a2eab169a69434c1e4ae13b3fefb4370041b8
|
7
|
+
data.tar.gz: f7eed1707e676d27d77035eac22516998b01fa62e57412104c633bfaec58222b4c40e54ab067fbc4ac7aa196cbe337a9c50fb3e067730facca19c362a699edf6
|
@@ -42,16 +42,14 @@ module Comee
|
|
42
42
|
|
43
43
|
def calculate_total
|
44
44
|
items = PurchaseOrderItem.where(purchase_order_id: id)
|
45
|
-
|
46
|
-
total = (total * (1 - discount / 100.0)).round(2) if discount&.positive?
|
47
|
-
total
|
45
|
+
items.sum(&:total_price).round(2)
|
46
|
+
# total = (total * (1 - discount / 100.0)).round(2) if discount&.positive?
|
48
47
|
end
|
49
48
|
|
50
49
|
def calculate_confirmed_total
|
51
50
|
items = PurchaseOrderItem.where(purchase_order_id: id)
|
52
|
-
|
53
|
-
confirmed_total = (confirmed_total * (1 - confirmed_discount / 100.0)).round(2) if confirmed_discount&.positive?
|
54
|
-
confirmed_total
|
51
|
+
items.sum(&:confirmed_total_price).round(2)
|
52
|
+
# confirmed_total = (confirmed_total * (1 - confirmed_discount / 100.0)).round(2) if confirmed_discount&.positive?
|
55
53
|
end
|
56
54
|
|
57
55
|
def self.ransackable_attributes(_auth_object = nil)
|
data/lib/comee/core/version.rb
CHANGED