comee_core 0.3.41 → 0.3.43

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945ebcfda26158faf04eeb992d73078a05ece14bf999e93287d4f9a40a536f3e
-  data.tar.gz: b85605bbe210dafc52a8f1e0f29f572c5ee258cbc65bfa11bfaee65ab88edcc3
+  metadata.gz: 4ff7350423a4f7d4bfbab481f69a78c1526754c515c6f58ccfd31f5e77b4eb60
+  data.tar.gz: 15b0575c52dcc8994efdba583b2455fa2375f1b87612e5fab71c765bdfe0f376
 SHA512:
-  metadata.gz: 1c67e379c9ae392240d543c73a99cb89f3084db1648df9ad2310fb5054589fb32a1cb8ab4a2270f1ceaa7f9eefcb018a19cf3c5d56c15de8b0ebb414f6048c76
-  data.tar.gz: 6d7578c2ebbf76fcba4ecf48e4ee43130f30a9b73ed5bd83d53e4cffafeb1d8f95dd4dbfbd451edbca971a4722cad75f5c55a8b3dea33aa8373b359ba0f349bf
+  metadata.gz: 85e67b19d45298a5da7fce3a0337516242fb073b05255836b313d9bacad96909b72582485b91f57d471de60e7756952cc025f22a95b77b599954215b185c08dc
+  data.tar.gz: a7b7c841130e5760d30b44ee997f4a275e1e28504cc84733b9c4fa228b2c905705e820fda9785c50ff67f99c88044026ecb68d9dcb5a61d93d66e91b1e858f15

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

@@ -1,11 +1,17 @@
 module Comee
   module Core
     class Invoice < ApplicationRecord
+      ADVANCE = "Advance".freeze
+      DELIVERY = "Delivery".freeze
+      DIRECT = "Direct".freeze
+
+      INVOICE_TYPES = [ADVANCE, DELIVERY, DIRECT].freeze
+
       before_validation :generate_invoice_no, if: proc { |inv| inv.invoice_no.nil? }
       before_save :calculate_due_date, unless: proc { |inv| inv.date_issued.nil? }
 
       belongs_to :sales_order
-      belongs_to :pod
+      belongs_to :pod, optional: true
       belongs_to :invoice_address,
                  -> { where(address_type: ClientAddress::INVOICING_ADDRESS) },
                  class_name: "Comee::Core::ClientAddress"
@@ -23,9 +29,35 @@ module Comee
       validates :total_price, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
       validates :amount_paid, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
 
+      validates :pct_advanced,
+                presence: true,
+                numericality: {greater_than: 0, less_than_or_equal_to: 100},
+                if: -> { advance? }
+      validates :pct_advanced,
+                absence: true,
+                if: -> { delivery? || direct? }
+      validates :pod_id,
+                presence: true,
+                if: -> { delivery? }
+      validates :pod_id,
+                absence: true,
+                if: -> { advance? }
+
       delegate(:order_number, to: :sales_order, prefix: false)
       delegate(:reference_no, to: :pod, prefix: true)
 
+      def delivery?
+        invoice_type == DELIVERY
+      end
+
+      def advance?
+        invoice_type == ADVANCE
+      end
+
+      def direct?
+        invoice_type == DIRECT
+      end
+
       def calculate_total_price
         self.total_price = calculate_total
       end
@@ -43,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
@@ -56,6 +90,7 @@ module Comee
           id
           sales_order_id
           invoice_no
+          invoice_type
           date_issued
           ship_name
           delivery_date

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/20240803231700_update_invoice_fields.rb

@@ -0,0 +1,7 @@
+class UpdateInvoiceFields < ActiveRecord::Migration[7.1]
+  def change
+    change_column_null :comee_core_invoices, :pod_id, true
+    add_column :comee_core_invoices, :invoice_type, :string, default: "Delivery"
+    add_column :comee_core_invoices, :pct_advanced, :float, null: true
+  end
+end

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.41".freeze
+    VERSION = "0.3.43".freeze
   end
 end

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

@@ -2,12 +2,14 @@ FactoryBot.define do
   factory :invoice, class: "Comee::Core::Invoice" do
     invoice_no { nil }
     sales_order
+    invoice_type { Comee::Core::Invoice::DELIVERY }
     pod
     date_issued { Date.current }
     due_date { Date.current.advance(days: 10) }
     total_price { 0 }
     amount_paid { 0 }
     payment_term { Faker::Lorem.sentence }
+    pct_advanced { nil }
     notifications_sent { 0 }
     status { Comee::Core::Invoice.statuses[:draft] }
     payment_status { Comee::Core::Invoice.payment_statuses[:not_paid] }
@@ -20,5 +22,16 @@ FactoryBot.define do
     trait :issued do
       status { Comee::Core::Invoice.statuses[:issued] }
     end
+
+    trait :advance do
+      invoice_type { Comee::Core::Invoice::ADVANCE }
+      pod { nil }
+      pct_advanced { 25 }
+    end
+
+    trait :direct do
+      invoice_type { Comee::Core::Invoice::DIRECT }
+      pct_advanced { nil }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.41
+  version: 0.3.43
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-03 00:00:00.000000000 Z
+date: 2024-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -535,6 +535,9 @@ files:
 - db/migrate/20240731080746_create_comee_core_credit_note_items.rb
 - 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