comee_core 0.3.42 → 0.3.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5543b44e3e8230affe2c45fa5850176535bff3c1e52ae12e7943265db65e840d
-  data.tar.gz: 8a53148bbf0c6a70e1efa88070820b5892bf871d24f8c50b7a2926626f652c04
+  metadata.gz: 4ff7350423a4f7d4bfbab481f69a78c1526754c515c6f58ccfd31f5e77b4eb60
+  data.tar.gz: 15b0575c52dcc8994efdba583b2455fa2375f1b87612e5fab71c765bdfe0f376
 SHA512:
-  metadata.gz: 2224cc02486c9aa4e57429827fce56803b5ac5a2ef4b5fb28b5e5b464e1f1f4e00694b3be0b03111175a74787f5ccf22373d0c7e3a67441221af2bd3f42b375d
-  data.tar.gz: e636c80554eb4262e96660fae38c767f2052d2553e89815bbc2faf6716eeb66ec56077679c22cb973829dfbf3f947e01c0f0039cab2fb782424f634be53cc355
+  metadata.gz: 85e67b19d45298a5da7fce3a0337516242fb073b05255836b313d9bacad96909b72582485b91f57d471de60e7756952cc025f22a95b77b599954215b185c08dc
+  data.tar.gz: a7b7c841130e5760d30b44ee997f4a275e1e28504cc84733b9c4fa228b2c905705e820fda9785c50ff67f99c88044026ecb68d9dcb5a61d93d66e91b1e858f15

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

@@ -75,7 +75,9 @@ 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)).round(2)
+        total = (items.sum(:total_price) + additionals.sum(:total_price))
+        total *= (pct_advanced / 100) if advance?
+        total.round(2)
       end
 
       def calculate_amount_paid

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

@@ -1,6 +1,8 @@
 module Comee
   module Core
     class ShipmentInstructionItem < ApplicationRecord
+      before_save :set_details, if: proc { |item| item.details.empty? }
+
       belongs_to :shipment_instruction
       belongs_to :shipment_item
       belongs_to :unit
@@ -9,6 +11,15 @@ module Comee
 
       validates :pallet_no, presence: true
       validates :length, :width, :height, :weight, :quantity, :price, presence: true, numericality: {greater_than: 0}
+
+      def set_details
+        self.details = {
+          customer_item_no: shipment_item.sales_order_item.customer_item_no,
+          customer_item_description: shipment_item.sales_order_item.customer_item_description,
+          customer_item_alias: shipment_item.sales_order_item.customer_item_alias,
+          use_alias: shipment_item.sales_order_item.use_alias
+        }
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class ShipmentInstructionItemSerializer < ActiveModel::Serializer
       attributes :id, :delivery_note_no, :pallet_no, :goods_issue_date, :length, :width, :height, :weight, :quantity, :price,
-                 :pod_id
+                 :pod_id, :details
       belongs_to :unit
       belongs_to :shipment_item
       belongs_to :pod

data/db/migrate/20240805085256_add_details_to_shipment_instruction_item.rb

@@ -0,0 +1,5 @@
+class AddDetailsToShipmentInstructionItem < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_shipment_instruction_items, :details, :jsonb, null: false, default: {}
+  end
+end

data/db/migrate/20240805093326_update_details_column_in_shipment_instruction_items.rb

@@ -0,0 +1,14 @@
+class UpdateDetailsColumnInShipmentInstructionItems < ActiveRecord::Migration[7.1]
+  def up
+    Comee::Core::ShipmentInstructionItem.reset_column_information
+    Comee::Core::ShipmentInstructionItem.find_each do |item|
+      details = {
+        customer_item_no: item.shipment_item.sales_order_item.customer_item_no,
+        customer_item_description: item.shipment_item.sales_order_item.customer_item_description,
+        customer_item_alias: item.shipment_item.sales_order_item.customer_item_alias,
+        use_alias: item.shipment_item.sales_order_item.use_alias
+      }
+      item.update_column(:details, details)
+    end
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.42".freeze
+    VERSION = "0.3.43".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.42
+  version: 0.3.43
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-04 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -536,6 +536,8 @@ files:
 - db/migrate/20240731081502_create_comee_core_credit_note_additional_items.rb
 - db/migrate/20240803194006_change_reference_in_invoice_to_polymorphic.rb
 - db/migrate/20240803231700_update_invoice_fields.rb
+- db/migrate/20240805085256_add_details_to_shipment_instruction_item.rb
+- db/migrate/20240805093326_update_details_column_in_shipment_instruction_items.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb