comee_core 0.3.17 → 0.3.19
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/invoice.rb +1 -1
- data/app/models/comee/core/master_price.rb +9 -0
- data/app/models/comee/core/purchase_order.rb +1 -1
- data/app/models/comee/core/sales_order.rb +1 -1
- data/app/serializers/comee/core/master_price_serializer.rb +2 -1
- data/app/serializers/comee/core/supplier_serializer.rb +1 -1
- data/db/migrate/20240703204755_add_currency_to_master_price.rb +9 -0
- data/lib/comee/core/version.rb +1 -1
- data/spec/factories/comee/core/master_prices.rb +1 -0
- metadata +3 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3a167a9d01cd03be307e0f99d440d4edfe98a86a8d3e84b9571b3c19b9389657
|
4
|
+
data.tar.gz: 429b64c12e99c22246678db52440ec59ef926217b51374e31bba5e9b8c166f6c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 3b64d2413b3325dd5d0d10b831b56bb2caba6068111c25c4cd581260a45b5ec9522c7e7ce221d806daed864893f7e1fdc205999aae9b511174cf18dc0a60423d
|
7
|
+
data.tar.gz: e57f98846dc9bdb9ace8478c206d11858938e0126ec86bc4ca9fb3b24b462c4b1109e4bf6031fc360932afd395a17fd7bed7ec058100a5fe7f7d2417e75e41b4
|
@@ -35,7 +35,7 @@ module Comee
|
|
35
35
|
def calculate_total
|
36
36
|
items = InvoiceItem.where(invoice_id: id)
|
37
37
|
additionals = AdditionalItem.where(invoice_id: id)
|
38
|
-
items.sum(:total_price) + additionals.sum(:total_price)
|
38
|
+
(items.sum(:total_price) + additionals.sum(:total_price)).round(2)
|
39
39
|
end
|
40
40
|
|
41
41
|
def self.ransackable_attributes(_auth_object = nil)
|
@@ -1,12 +1,15 @@
|
|
1
1
|
module Comee
|
2
2
|
module Core
|
3
3
|
class MasterPrice < Price
|
4
|
+
before_save :set_default_currency
|
5
|
+
|
4
6
|
enum :price_status, {draft: 0, approved: 1}
|
5
7
|
belongs_to :supplier
|
6
8
|
belongs_to :previous_price, class_name: "Comee::Core::MasterPrice", optional: true
|
7
9
|
belongs_to :next_price, class_name: "Comee::Core::MasterPrice", optional: true
|
8
10
|
belongs_to :country_of_origin, -> { where(lookup_type: :country) }, class_name: "Comee::Core::Lookup", optional: true
|
9
11
|
belongs_to :product_lookup, optional: true
|
12
|
+
belongs_to :currency, optional: true
|
10
13
|
|
11
14
|
validates :purchase_price, :selling_price, presence: true
|
12
15
|
validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
|
@@ -43,6 +46,12 @@ module Comee
|
|
43
46
|
end
|
44
47
|
end
|
45
48
|
|
49
|
+
def set_default_currency
|
50
|
+
return if currency
|
51
|
+
|
52
|
+
self.currency = Comee::Core::Currency.find_by(code: "EUR")
|
53
|
+
end
|
54
|
+
|
46
55
|
def self.ransackable_attributes(_auth_object = nil)
|
47
56
|
%w[
|
48
57
|
id
|
@@ -42,7 +42,7 @@ module Comee
|
|
42
42
|
def calculate_total
|
43
43
|
order_items = SalesOrderItem.where(sales_order_id: id)
|
44
44
|
services = AdditionalService.where(sales_order_id: id)
|
45
|
-
order_items.sum(&:total_price) + services.sum(&:total_price)
|
45
|
+
(order_items.sum(&:total_price) + services.sum(&:total_price)).round(2)
|
46
46
|
end
|
47
47
|
|
48
48
|
def set_parent_client_name
|
@@ -2,12 +2,13 @@ module Comee
|
|
2
2
|
module Core
|
3
3
|
class MasterPriceSerializer < ActiveModel::Serializer
|
4
4
|
attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin, :lead_time, :status,
|
5
|
-
:price_status, :state_of_origin
|
5
|
+
:price_status, :state_of_origin, :currency_id
|
6
6
|
belongs_to :product
|
7
7
|
belongs_to :supplier
|
8
8
|
belongs_to :product_lookup
|
9
9
|
belongs_to :unit
|
10
10
|
belongs_to :country_of_origin
|
11
|
+
belongs_to :currency
|
11
12
|
end
|
12
13
|
end
|
13
14
|
end
|
@@ -1,7 +1,7 @@
|
|
1
1
|
module Comee
|
2
2
|
module Core
|
3
3
|
class SupplierSerializer < ActiveModel::Serializer
|
4
|
-
attributes :id, :code, :name, :locale, :user_id, :payment_terms, :tax_code, :vat_number
|
4
|
+
attributes :id, :code, :name, :locale, :user_id, :payment_terms, :tax_code, :vat_number, :currency_id
|
5
5
|
belongs_to :currency
|
6
6
|
has_many :supplier_addresses
|
7
7
|
end
|
data/lib/comee/core/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: comee_core
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.19
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Henock L.
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2024-07-
|
11
|
+
date: 2024-07-04 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: active_model_serializers
|
@@ -534,6 +534,7 @@ files:
|
|
534
534
|
- db/migrate/20240630122016_create_comee_core_additional_services.rb
|
535
535
|
- db/migrate/20240702151519_add_vat_to_purchase_order.rb
|
536
536
|
- db/migrate/20240702181613_add_vat_to_invoice.rb
|
537
|
+
- db/migrate/20240703204755_add_currency_to_master_price.rb
|
537
538
|
- lib/comee/core.rb
|
538
539
|
- lib/comee/core/engine.rb
|
539
540
|
- lib/comee/core/version.rb
|