comee_core 0.3.22 → 0.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ef62a4650cf347d3276dede12a8c429757c5261df0697d3632a73b907c1c27a
-  data.tar.gz: 30d1511ab8a333c92730ccd98f16ced09d5c29aff58e7692fdbf908475ad2370
+  metadata.gz: dc08ad949c9e66f2b2f4026348c29fba65c68e823ec852b02d05e6b45afdaf99
+  data.tar.gz: d8571a7b44137ee4f48ed5b08b7d753462428ab80abceca23b36875fcb504e46
 SHA512:
-  metadata.gz: e9d3e24823a44a19181692cb570c04bb78e7ff6632022fa1e76fbd5ef330bb06be7770c2589b49d19b6613d406199f81f5e6c4c9359675a18621a719d0b5224e
-  data.tar.gz: 28e92974cd248a841c25dac76b5dd93f89416159b16dde9778a1d51628daece86eb13d332965816e835ffce6550236bd8fc4bfd76b754ea0af43c4669957c099
+  metadata.gz: 5b52af4a6c6203f3e3978c2ce8ab82e5edef410d6d44a3c6bb5d8dfa8fdcfc004164da1ba0947e66ef90ee156e0fabdc2967a05077b3f731126fb9d006a7ecac
+  data.tar.gz: dd308ef0b4048733475bd5b1c5f14e6cdfa173ef0eab79c1a2203fa04a37fb2103adbef23dc84638a74959667a136bcbd87e27da59a06c2bc29f4925beeed5eb

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

@@ -3,8 +3,7 @@ module Comee
     class SalesOrderItem < ApplicationRecord
       default_scope { order(serial_no: :asc) }
 
-      before_save :calculate_total_price
-      before_save :calculate_handover_date
+      before_save :calculate_total_price, :calculate_handover_date, :calculate_price_change, :calculate_quantity_change
       after_save :update_sales_order
       after_save :update_sales_order_purchase_status, if: proc { |item| item.fully_processed? }
       after_destroy :update_sales_order
@@ -42,6 +41,30 @@ module Comee
         sales_order.save!
       end
 
+      def calculate_price_change
+        return if customer_order_item.unit_id == unit_id && customer_order_item.price == price
+
+        if customer_order_item.unit_id == unit_id
+          self.price_diff = price - customer_order_item.price
+        else
+          service = CustomerOrderService.new
+          co_price = service.convert_price(customer_order_item.price, customer_order_item.unit_id, unit_id)
+          self.price_diff = price - co_price
+        end
+      end
+
+      def calculate_quantity_change
+        return if customer_order_item.unit_id == unit_id && customer_order_item.quantity == quantity
+
+        if customer_order_item.unit_id == unit_id
+          self.quantity_diff = quantity - customer_order_item.quantity
+        else
+          service = CustomerOrderService.new
+          co_quantity = service.convert_quantity(customer_order_item.quantity, customer_order_item.unit_id, unit_id)
+          self.quantity_diff = quantity - co_quantity
+        end
+      end
+
       def quantity_remaining
         quantity - (quantity_delivered + quantity_canceled)
       end

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

@@ -3,7 +3,7 @@ module Comee
     class SalesOrderItemSerializer < ActiveModel::Serializer
       attributes :id, :serial_no, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :quantity_canceled,
                  :price, :handover_date, :delivery_date, :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id,
-                 :total_price, :canceled, :processing_status, :additional_details, :created_at
+                 :price_diff, :quantity_diff, :total_price, :canceled, :processing_status, :additional_details, :created_at
       belongs_to :sales_order
       belongs_to :customer_order_item
       belongs_to :source

data/app/services/comee/core/customer_order_service.rb

@@ -194,6 +194,7 @@ module Comee
             raise(StandardError, "No primary supplier found for product #{item.customer_item_no}") unless master_price
 
             product_lookup = master_price.product_lookup
+            order_price = convert_price(item.price, item.unit_id, unit_id)
             price = if client_price
                       convert_price(client_price.price, client_price.unit_id, unit_id)
                     else
@@ -210,6 +211,7 @@ module Comee
               customer_item_description: item.customer_item_description,
               quantity: quantity,
               price: price,
+              price_diff: price - order_price,
               total_price: quantity * price,
               delivery_date: item.delivery_date,
               handover_date: order.handover_date,

data/db/migrate/20240706160902_add_change_fields_to_sales_order_item.rb

@@ -0,0 +1,6 @@
+class AddChangeFieldsToSalesOrderItem < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_sales_order_items, :price_diff, :float, null: true, default: 0
+    add_column :comee_core_sales_order_items, :quantity_diff, :float, null: true, default: 0
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.22".freeze
+    VERSION = "0.3.24".freeze
   end
 end

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

@@ -5,14 +5,16 @@ FactoryBot.define do
     association :customer_order_item, :with_inventory
     source factory: :fulfillment_center
     product
-    unit
+    unit { customer_order_item.unit }
     purchase_order_item { nil }
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
     customer_item_description { Faker::Lorem.sentence }
-    quantity { 100 }
+    quantity { customer_order_item.quantity }
+    quantity_diff { 0 }
     quantity_delivered { 0 }
     quantity_canceled { 0 }
-    price { 50 }
+    price { customer_order_item.price }
+    price_diff { 0 }
     total_price { quantity * price }
     delivery_date { Date.current.advance(months: 1) }
     handover_date { Date.current }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.24
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-06 00:00:00.000000000 Z
+date: 2024-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -535,6 +535,7 @@ files:
 - 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
+- db/migrate/20240706160902_add_change_fields_to_sales_order_item.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb