comee_core 0.3.17 → 0.3.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31d273c0f307b780445d84f77724d21676a90ecb97923b6e57452f011a31ede1
-  data.tar.gz: 8e5b700c41f8dcd22bccf746756bfdcc6669a1774622cf9f4dd03c1383a7b6a4
+  metadata.gz: f7b45dd03c08ff2f2aaecfa3bb2b4c48c0640240ccc8f2988311754ff25e031a
+  data.tar.gz: f992aef504e763d0583ecaecdc1744dede77600bcfcdf2530e21c6da0f14bf27
 SHA512:
-  metadata.gz: d8b7269868908faea7b9fce4be61b9a9d0302a29854d29ea37948afd9c0a6ba77949aa5e241bb24ad63cd7b50faad5c2650d57d7311272c131c609511f4c0169
-  data.tar.gz: a11db8aeef2a636b16b5723c41bd8385107cf8554ddb87ddc98f1173d36fa2611619cce558194059d30e225f38b5596c704fc2f5abb5c6f5a934bdfe6c87a804
+  metadata.gz: 99585c3f085b3a361c9cf06b04aa5dca4a5273093457e3f80c2abcb6c139fdb1e49f088db13aa9c02df1a75c8897239aa8d90216acc9e6d6d18a0024b0fc1930
+  data.tar.gz: 9a63b2fa0373ee075bb40b16786ba3926c40559410475f11c12bed3b235726c760d196b152a42620e056458f890706439f67d6d97f075b4eda371187c53e1b99

data/app/models/comee/core/invoice.rb

@@ -35,7 +35,7 @@ module Comee
       def calculate_total
         items = InvoiceItem.where(invoice_id: id)
         additionals = AdditionalItem.where(invoice_id: id)
-        items.sum(:total_price) + additionals.sum(:total_price)
+        (items.sum(:total_price) + additionals.sum(:total_price)).round(2)
       end
 
       def self.ransackable_attributes(_auth_object = nil)

data/app/models/comee/core/master_price.rb

@@ -1,12 +1,15 @@
 module Comee
   module Core
     class MasterPrice < Price
+      before_save :set_default_currency
+
       enum :price_status, {draft: 0, approved: 1}
       belongs_to :supplier
       belongs_to :previous_price, class_name: "Comee::Core::MasterPrice", optional: true
       belongs_to :next_price, class_name: "Comee::Core::MasterPrice", optional: true
       belongs_to :country_of_origin, -> { where(lookup_type: :country) }, class_name: "Comee::Core::Lookup", optional: true
       belongs_to :product_lookup, optional: true
+      belongs_to :currency, optional: true
 
       validates :purchase_price, :selling_price, presence: true
       validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
@@ -43,6 +46,12 @@ module Comee
         end
       end
 
+      def set_default_currency
+        return if currency
+
+        self.currency = Comee::Core::Currency.find_by(code: "EUR")
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

data/app/models/comee/core/purchase_order.rb

@@ -20,7 +20,7 @@ module Comee
 
       def calculate_total_price
         items = PurchaseOrderItem.where(purchase_order_id: id)
-        self.total_price = items.sum(&:total_price)
+        self.total_price = items.sum(&:total_price).round(2)
       end
 
       def calculate_vat

data/app/models/comee/core/sales_order.rb

@@ -42,7 +42,7 @@ module Comee
       def calculate_total
         order_items = SalesOrderItem.where(sales_order_id: id)
         services = AdditionalService.where(sales_order_id: id)
-        order_items.sum(&:total_price) + services.sum(&:total_price)
+        (order_items.sum(&:total_price) + services.sum(&:total_price)).round(2)
       end
 
       def set_parent_client_name

data/app/serializers/comee/core/master_price_serializer.rb

@@ -2,12 +2,13 @@ module Comee
   module Core
     class MasterPriceSerializer < ActiveModel::Serializer
       attributes :id, :purchase_price, :selling_price, :valid_from, :valid_to, :primary, :margin, :lead_time, :status,
-                 :price_status, :state_of_origin
+                 :price_status, :state_of_origin, :currency_id
       belongs_to :product
       belongs_to :supplier
       belongs_to :product_lookup
       belongs_to :unit
       belongs_to :country_of_origin
+      belongs_to :currency
     end
   end
 end

data/db/migrate/20240703204755_add_currency_to_master_price.rb

@@ -0,0 +1,9 @@
+class AddCurrencyToMasterPrice < ActiveRecord::Migration[7.1]
+  def change
+    add_reference :comee_core_master_prices,
+                  :currency,
+                  index: {name: "currency_on_ccmp_indx"},
+                  null: true,
+                  foreign_key: {to_table: :comee_core_currencies}
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.17".freeze
+    VERSION = "0.3.18".freeze
   end
 end

data/spec/factories/comee/core/master_prices.rb

@@ -17,6 +17,7 @@ FactoryBot.define do
     propagated_to_client { false }
     country_of_origin factory: :country
     state_of_origin { "02 - Hamburg" }
+    currency
 
     trait :approved do
       price_status { Comee::Core::Price.price_statuses[:approved] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-02 00:00:00.000000000 Z
+date: 2024-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -534,6 +534,7 @@ files:
 - db/migrate/20240630122016_create_comee_core_additional_services.rb
 - db/migrate/20240702151519_add_vat_to_purchase_order.rb
 - db/migrate/20240702181613_add_vat_to_invoice.rb
+- db/migrate/20240703204755_add_currency_to_master_price.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb