comee_core 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d7cf157e4f4751fc575616de0c6828c89b2fff51cf7dcd28347feb7f668ad6b
-  data.tar.gz: 1dac2167d8e7419c2312ec89cf8e8276f56ed1ca6ef0ac6a71e24ec432cec1bf
+  metadata.gz: c3e3cec335fce496f7b2a857329c5c098631310a7bcfa3d2e21a62fc38041c56
+  data.tar.gz: 3dc1d1f162ea1179e5f51f5ab0213a264a336b9400f7af90b7b1fa998f638340
 SHA512:
-  metadata.gz: 88c434b7eb17e6dba7c24911369d03128f0eaeed66409a5e6c1bce86b1648948ce07d6e4472c12c2bc3ada0aad59c79c8a9644921cb977c873c48b8aaab2bbec
-  data.tar.gz: 6307f0083025d5473b9a7bf14a1f43070bf4590e8a2c890070e203cc64842fc8c692dc721ea248aed3c606321962df6bf372269aabbf4e9bb6a7a8adcdca1367
+  metadata.gz: 561f02819a07e98ba47fe8d0b522c54639b201d29fb2ba7720eae53e86e7de480ad06d86c16f49b316157ce5cbcbca15c3620bd121cbf91b253b424910a896b7
+  data.tar.gz: fe59c449c4d1120992b3cb2c5d0cde23f3fe84945b58b9e74e766b0ea8bd4ddab6c4ebe78324c9ffc66e9bcdef22e89fd1933d8a055e58fb13b55790fccd766b

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

@@ -1,27 +1,18 @@
 module Comee
   module Core
     class Invoice < ApplicationRecord
-      before_save :update_invoice_total
       belongs_to :sales_order
+      belongs_to :pod
       has_many :invoice_items
 
       has_noticed_notifications model_name: "Comee::Core::Notification"
 
       enum :status, {draft: 0, approved: 1}
-      enum :payment_status, {not_settled: 0, settled: 1}
+      enum :payment_status, {not_paid: 0, partially_paid: 1, fully_paid: 2, overpaid: 3}
 
       validates :invoice_no, presence: true, uniqueness: true
       validates :date_issued, :payment_term, :status, :payment_status, presence: true
-      validates :additional_charges, :total_price, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
-
-      delegate(:order_number, to: :sales_order)
-
-      def update_invoice_total
-        self.additional_charges ||= 0
-        self.total_price ||= 0
-        self.total_price -= additional_charges_was if additional_charges_was && additional_charges_changed?
-        self.total_price += additional_charges
-      end
+      validates :total_price, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[

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

@@ -2,21 +2,13 @@ module Comee
   module Core
     class InvoiceItem < ApplicationRecord
       before_save { self.total_price = unit_price * quantity }
-      after_save :update_invoice_total
 
-      belongs_to :sales_order_item
+      belongs_to :shipment_instruction_item
       belongs_to :invoice
+      belongs_to :unit
 
       validates :quantity, :unit_price, presence: true, numericality: {greater_than: 0}
       validates :total_price, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
-
-      delegate(:product_code, to: :sales_order_item)
-      delegate(:product_name, to: :sales_order_item)
-
-      def update_invoice_total
-        invoice.total_price = InvoiceItem.where(invoice: invoice).map(&:total_price).sum
-        invoice.save!
-      end
     end
   end
 end

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

@@ -3,6 +3,7 @@ module Comee
     class Pod < ApplicationRecord
       enum :status, {draft: 0, confirmed: 1, signed: 2}
       has_many :shipment_instruction_items
+      has_many :invoices
 
       validates :reference_no, :status, presence: true
     end

data/db/migrate/{20230915205522_create_comee_core_invoices.rb → 20240105205522_create_comee_core_invoices.rb}

@@ -6,13 +6,14 @@ class CreateComeeCoreInvoices < ActiveRecord::Migration[7.0]
                    null: false,
                    index: {name: "co_on_cci_indx"},
                    foreign_key: {to_table: :comee_core_sales_orders}
-      t.date :date_issued, null: false
-      t.string :ship_name
-      t.date :delivery_date
-      t.string :voyage_no
-      t.float :additional_charges
+      t.references :pod,
+                   null: false,
+                   index: {name: "pod_on_cci_indx"},
+                   foreign_key: {to_table: :comee_core_pods}
+      t.date :date_issued
+      t.date :due_date
       t.float :total_price
-      t.string :payment_term, null: false
+      t.string :payment_term
       t.integer :notifications_sent
       t.integer :status, null: false, default: 0
       t.integer :payment_status, null: false, default: 0

data/db/migrate/{20230915205648_create_comee_core_invoice_items.rb → 20240105205648_create_comee_core_invoice_items.rb}

@@ -1,13 +1,17 @@
 class CreateComeeCoreInvoiceItems < ActiveRecord::Migration[7.0]
   def change
     create_table :comee_core_invoice_items do |t|
-      t.references :sales_order_item,
+      t.references :shipment_instruction_item,
                    null: false,
-                   index: {name: "soi_on_ccii_indx"},
-                   foreign_key: {to_table: :comee_core_sales_order_items}
+                   index: {name: "sii_on_ccii_indx"},
+                   foreign_key: {to_table: :comee_core_shipment_instruction_items}
+      t.references :unit,
+                   null: false,
+                   index: {name: "unit_on_ccii_indx"},
+                   foreign_key: {to_table: :comee_core_units}
       t.float :quantity, null: false
       t.float :unit_price, null: false
-      t.float :total_price, null: false
+      t.float :total_price
       t.references :invoice,
                    null: false,
                    index: {name: "invoice_on_ccii_indx"},

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.1".freeze
+    VERSION = "0.2.3".freeze
   end
 end

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

@@ -1,9 +1,10 @@
 FactoryBot.define do
   factory :invoice_item, class: "Comee::Core::InvoiceItem" do
-    sales_order_item
+    shipment_instruction_item
+    unit
     quantity { 10 }
     unit_price { 5 }
-    total_price { 50 }
+    total_price { quantity * unit_price }
     invoice
   end
 end

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

@@ -2,15 +2,13 @@ FactoryBot.define do
   factory :invoice, class: "Comee::Core::Invoice" do
     invoice_no { Faker::Alphanumeric.alpha(number: 8) }
     sales_order
+    pod
     date_issued { Date.current }
-    ship_name { Faker::Name.name }
-    delivery_date { Date.current.advance(days: -7) }
-    voyage_no { Faker::Alphanumeric.alpha(number: 10) }
-    additional_charges { 0 }
+    due_date { Date.current.advance(days: 10) }
     total_price { 0 }
     payment_term { Faker::Lorem.sentence }
     notifications_sent { 0 }
     status { Comee::Core::Invoice.statuses[:draft] }
-    payment_status { 0 }
+    payment_status { Comee::Core::Invoice.payment_statuses[:not_paid] }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-01-22 00:00:00.000000000 Z
+date: 2024-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -405,8 +405,6 @@ files:
 - db/migrate/20230813041307_create_comee_core_product_lookups.rb
 - db/migrate/20230813235946_create_comee_core_master_prices.rb
 - db/migrate/20230814151601_create_comee_core_client_prices.rb
-- db/migrate/20230915205522_create_comee_core_invoices.rb
-- db/migrate/20230915205648_create_comee_core_invoice_items.rb
 - db/migrate/20230929115336_create_comee_core_order_sources.rb
 - db/migrate/20230929130910_create_comee_core_client_orders.rb
 - db/migrate/20231003073316_create_comee_core_inventories.rb
@@ -422,9 +420,11 @@ files:
 - db/migrate/20231206082503_create_comee_core_unit_conversions.rb
 - db/migrate/20231207153420_create_comee_core_shipment_items.rb
 - db/migrate/20231207235542_create_comee_core_item_statuses.rb
-- db/migrate/20240103074619_create_comee_core_pods.rb
+- db/migrate/20240104074619_create_comee_core_pods.rb
 - db/migrate/20240104131607_create_comee_core_shipment_instructions.rb
 - db/migrate/20240104143246_create_comee_core_shipment_instruction_items.rb
+- db/migrate/20240105205522_create_comee_core_invoices.rb
+- db/migrate/20240105205648_create_comee_core_invoice_items.rb
 - db/migrate/20240109185749_create_comee_core_transport_availability.rb
 - db/migrate/20240109185931_create_comee_core_time_slots.rb
 - db/migrate/20240111112140_create_comee_core_pickup_schedules.rb