comee_core 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57905a1877a1cfdd9fea4c9e066e0f9ee22917dac5b52da002c2c6870f8599da
-  data.tar.gz: fd73641d6b2535751080b5d582b96e4f8506b192f990b664644afaef4a187b7b
+  metadata.gz: dee86ba54d03d24746b9bee9206b141b1fe630e4f25197073e6da4b400a4bbca
+  data.tar.gz: 8626a1eebf4ee8ad7f236e5832598f5a41ee3cc3a5c9d0238d307f3a219062fb
 SHA512:
-  metadata.gz: 74ed17525f0cad01052f2b1b3f4dbe72dc6c155422e738ca441686402b3fa19ab1c6c616021c211e918b39d05d00cef643b0cbf7e634250bc1a72d4c8a838fed
-  data.tar.gz: 78ddd02578f0e92d16d75e04399d08d081fd9d00e989c4ea76c6c7ec29b86686010a91032a2e3de26369e817a997b7b1c7e554c0a1301e9ccc6d50a095fba79c
+  metadata.gz: 6a140b4c3860bc2c115297768421772b749a9ca23560027b2f2e3d7bee0a63c60397badc4b4aea3d12ab85edb7161289c9c4cb2387cea8f9da1efd5616671a03
+  data.tar.gz: c9b452eaedcf75e2a42265dfd4eed794f32b7fbce5febacf51014716ca2c13aae0509bc7f698760d3ab47268def7fc928255bdc33b3e11e9fc7981d73cf09518

data/app/controllers/comee/core/sales_orders_controller.rb

@@ -60,7 +60,7 @@ module Comee
       def model_params
         params.require(:payload).permit(:order_number, :customer_order_id, :payment_penalty, :payment_term, :delivery_term, :status,
                                         :fulfillment_center_id, :total_price, :amount_paid, :pallete_note, :handover_date, :remark,
-                                        :client_id, files: [])
+                                        :consignee, :client_id, files: [])
       end
 
       def back_order_params

data/app/controllers/comee/core/shipment_items_controller.rb

@@ -61,7 +61,7 @@ module Comee
 
       def model_params
         params.require(:payload).permit(:sales_order_item_id, :quantity, :shipment_status, :status, :handover_date, :delivery_date,
-                                        :pallet_no)
+                                        :pallet_no, :consignee, :order_number)
       end
     end
   end

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

@@ -1,27 +1,17 @@
 module Comee
   module Core
     class Invoice < ApplicationRecord
-      before_save :update_invoice_total
       belongs_to :sales_order
       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/item_status.rb

@@ -2,7 +2,7 @@ module Comee
   module Core
     class ItemStatus < ApplicationRecord
       INITIALIZED = "Initialized".freeze
-      DELIVERY_NOTE_CREATED = "Delivery note created".freeze
+      DELIVERY_NOTE_CREATED = "Delivery Note Created".freeze
       COMPLETELY_PICKED_AND_PACKED = "Completely Picked & Packed".freeze
       PARTIALLY_PICKED_AND_PACKED = "Partially Picked & Packed".freeze
 

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

@@ -6,7 +6,7 @@ module Comee
       belongs_to :sales_order_item
       has_many :item_statuses
 
-      validates :handover_date, :delivery_date, :shipment_status, :status, presence: true
+      validates :handover_date, :delivery_date, :shipment_status, :status, :order_number, presence: true
       validates :quantity, presence: true, numericality: {greater_than: 0}
 
       def self.ransackable_attributes(_auth_object = nil)

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class SalesOrderSerializer < ActiveModel::Serializer
       attributes :id, :order_number, :payment_penalty, :status, :total_price, :payment_term, :delivery_term, :amount_paid,
-                 :pallete_note, :handover_date, :remark, :parent_client_name, :created_by, :files_url, :customs_detail
+                 :pallete_note, :handover_date, :remark, :parent_client_name, :created_by, :files_url, :customs_detail, :consignee
       belongs_to :customer_order
       belongs_to :client
       belongs_to :fulfillment_center

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

@@ -1,7 +1,8 @@
 module Comee
   module Core
     class ShipmentItemSerializer < ActiveModel::Serializer
-      attributes :id, :quantity, :shipment_status, :status, :handover_date, :delivery_date, :pallet_no
+      attributes :id, :quantity, :shipment_status, :status, :handover_date, :delivery_date, :pallet_no, :consignee,
+                 :order_number
       belongs_to :sales_order_item
     end
   end

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

@@ -141,6 +141,7 @@ module Comee
             customer_order: order,
             status: SalesOrder.statuses[:draft],
             client: order.client,
+            consignee: order.consignee,
             created_by: accepted_by || ""
           )
           order_items = order.customer_order_items.includes(:product, :unit)

data/db/migrate/20230812190652_create_comee_core_sales_orders.rb

@@ -14,6 +14,7 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
                    null: false,
                    index: {name: "client_on_ccso_indx"},
                    foreign_key: {to_table: :comee_core_clients}
+      t.string :consignee
       t.string :parent_client_name
       t.string :payment_term
       t.string :delivery_term

data/db/migrate/20231207153420_create_comee_core_shipment_items.rb

@@ -11,6 +11,8 @@ class CreateComeeCoreShipmentItems < ActiveRecord::Migration[7.1]
       t.date :handover_date, null: false
       t.date :delivery_date, null: false
       t.string :pallet_no
+      t.string :consignee
+      t.string :order_number, null: false
 
       t.timestamps
     end

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

@@ -6,13 +6,10 @@ 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.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.0".freeze
+    VERSION = "0.2.2".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

@@ -3,14 +3,11 @@ FactoryBot.define do
     invoice_no { Faker::Alphanumeric.alpha(number: 8) }
     sales_order
     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

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

@@ -11,6 +11,7 @@ FactoryBot.define do
     amount_paid { 0 }
     status { Comee::Core::SalesOrder.statuses[:draft] }
     pallete_note { Faker::Lorem.sentence }
+    consignee { Faker::Name.name }
     remark { Faker::Lorem.sentence }
     parent_client_name { Faker::Name.name }
     created_by { Faker::Name.name }

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

@@ -7,5 +7,7 @@ FactoryBot.define do
     handover_date { Date.current.advance(days: 3) }
     delivery_date { Date.current.advance(days: 6) }
     pallet_no { Faker::Alphanumeric.alpha(number: 10) }
+    consignee { Faker::Name.name }
+    order_number { sales_order_item.sales_order.order_number }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 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