comee_core 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd406451f665c2411b46b48fed525f69afd962075634190a5b48cd7c364c439a
-  data.tar.gz: 48fb03e9374548943dc7b5c882af57da8858a1020b7cf51d3c1057ca4c553b80
+  metadata.gz: 3977dd0f3b6240767a796a47eea12d0416a294884beab0afcd922ee36fe32fa8
+  data.tar.gz: 608f811273a984214974ff03f006b01b084cb766478c67da439c144570b89b65
 SHA512:
-  metadata.gz: da647c1b130ae6a410a278621f11f81008005b2dd63e456cbb16a257df041e8a25bfde11c39824808f8418933c84436e66ec75fcf0065f9fa5aa670cd4c43e39
-  data.tar.gz: 9dec58c03d0f7ab17f0c302aebe2a9d130b1e5868178b59989383e099d64e6040a302d3a85c29e1c25606c4d786f8c7fbde9bac9050b406f1557a425ba21cbd6
+  metadata.gz: d39a9af367c1146deb698ae4e1ba4132a355ac5f19cd2b6fa5583492dbb2347450ef90ef907106c32b3a260729c0e45a719494ddb73e8c8bd2ac73850fefc5fa
+  data.tar.gz: 7d4914e40e9f67cd3dab3199f6a5dfd3551333342901656c70a2308f6862c946c9e01a6c0fbbc6a76b9c6b1e32ad1471ffc09c45f72c0db4368d735c3bcec6b5

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

@@ -8,7 +8,7 @@ module Comee
       validates :price, presence: true
       validates :price, numericality: {greater_than: 0}
       validates :discount, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
-      validates :product_id, uniqueness: {scope: %i[client_id previous_price_id]}
+      validates :product_id, uniqueness: {scope: %i[client_id previous_price_id next_price_id status]}
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[

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

@@ -0,0 +1,11 @@
+module Comee
+  module Core
+    class CustomerOrder < ApplicationRecord
+      belongs_to :client
+
+      enum :status, {draft: 0, submitted: 1, accepted: 2, cancelled: 3}
+
+      validates :order_number, :order_date, :order_terms, :delivery_address, :invoice_address, :status, presence: true
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+module Comee
+  module Core
+    class CustomerOrderItem < ApplicationRecord
+      belongs_to :customer_order
+      belongs_to :product
+      belongs_to :unit
+
+      validates :quantity, :price, :delivery_date, presence: true
+    end
+  end
+end

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

@@ -7,7 +7,7 @@ module Comee
 
       validates :purchase_price, :selling_price, presence: true
       validates :margin, presence: true, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
-      validates :product_id, uniqueness: {scope: %i[supplier_id previous_price_id]}
+      validates :product_id, uniqueness: {scope: %i[supplier_id previous_price_id next_price_id status]}
       validate :validate_primary_price
 
       scope :current_primary, -> { where(primary: true).current }

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

@@ -1,20 +1,29 @@
 module Comee
   module Core
     class SalesOrder < ApplicationRecord
-      belongs_to :client
+      before_save :total_price
+
+      belongs_to :customer_order
       has_many :sales_order_items
 
       enum :status, {draft: 0, confirmed: 1, cancelled: 2}
 
       validates :order_number, presence: true, uniqueness: true
-      validates :order_date, :expected_delivery_date, :delivery_address, :invoice_address, :status, presence: true
-      validates :payment_no_of_days,
-                :payment_discount,
-                :payment_penalty,
+      validates :status, :pallete_note, :handover_date, presence: true
+      validates :payment_penalty,
                 presence: true,
                 numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
 
-      delegate(:name, to: :client, prefix: true)
+      validates :total_price,
+                :amount_paid,
+                presence: true,
+                numericality: {greater_than_or_equal_to: 0}
+
+      def total_price
+        sales_order_items = SalesOrderItem.where(sales_order_id: id)
+        total_price = sales_order_items.sum(&:price)
+        self.total_price = total_price
+      end
 
       def confirm
         raise(StandardError, "Sales order is already confirmed.") if SalesOrder.statuses[status] == SalesOrder.statuses[:confirmed]
@@ -32,13 +41,9 @@ module Comee
 
       def self.ransackable_attributes(_auth_object = nil)
         %w[
-          delivery_address
-          expected_delivery_date
-          invoice_address
-          order_date
           order_number
           status
-          client_id
+          customer_order_id
         ]
       end
 

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

@@ -1,42 +1,14 @@
 module Comee
   module Core
     class SalesOrderItem < ApplicationRecord
-      before_validation :set_delivery_date, if: proc { delivery_date.nil? }
-      before_validation :update_quantity_remaining, if: proc { quantity_remaining.nil? }
-
       belongs_to :sales_order
-      belongs_to :product
+      belongs_to :customer_order_item
+      belongs_to :unit
       has_many :warehouse_shipment_items
 
       validates :delivery_date, presence: true
       validates :quantity, :price, presence: true, numericality: {greater_than: 0}
-      validates :quantity_en_route, numericality: {greater_than_or_equal_to: 0}
-      validates :quantity_remaining, numericality: {greater_than: 0}
-
-      delegate(:name, to: :product, prefix: true)
-      delegate(:code, to: :product, prefix: true)
-
-      def set_delivery_date
-        self.delivery_date = sales_order.expected_delivery_date
-      end
-
-      def update_quantity_remaining
-        self.quantity_remaining = quantity
-        return unless quantity_en_route_changed? && quantity_en_route_was.positive? && quantity_en_route.zero?
-
-        self.quantity_remaining -= quantity_en_route_was
-      end
-
-      def update_quantity_en_route(quantity)
-        self.quantity_en_route = quantity
-        save
-      end
-
-      def confirm_delivery
-        self.quantity_remaining -= quantity_en_route
-        self.quantity_en_route = 0
-        save
-      end
+      validates :quantity_delivered, numericality: {greater_than_or_equal_to: 0}
     end
   end
 end

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

@@ -37,12 +37,13 @@ module Comee
           {
             id: order_item.id,
             sales_order_id: order_item.sales_order_id,
-            product_id: order_item.product_id,
+            unit_id: order_item.unit_id,
+            customer_order_item_id: order_item.customer_order_item_id,
             quantity: order_item.quantity,
-            quantity_en_route: order_item.quantity_en_route + item.quantity,
-            quantity_remaining: order_item.quantity_remaining - item.quantity,
+            quantity_delivered: order_item.quantity_delivered,
             price: order_item.price,
-            delivery_date: order_item.delivery_date
+            delivery_date: order_item.delivery_date,
+            eb_number: order_item.eb_number
           }
         end
         SalesOrderItem.upsert_all(updates)
@@ -58,7 +59,10 @@ module Comee
         order_items = warehouse_shipment_items.includes(:sales_order_item).map(&:sales_order_item)
         return self unless order_items.count.positive?
 
-        SalesOrderItem.where(id: order_items.map(&:id)).update_all(quantity_en_route: 0)
+        order_items.each do |sales_order_item|
+          sales_order_item.update(quantity_delivered: sales_order_item.quantity)
+        end
+        # SalesOrderItem.where(id: order_items.map(&:id)).update_all(quantity_delivered: sales_order_item.quantity)
         self
       end
     end

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

@@ -12,9 +12,9 @@ module Comee
       def validate_inventory_quantity
         return unless quantity && sales_order_item
 
-        inventory = Inventory.find_by(product_id: sales_order_item.product_id)
+        inventory = Inventory.find_by(product_id: sales_order_item.customer_order_item.product_id)
         unless inventory
-          errors.add(:base, "Inventory entry not found for product `#{sales_order_item.product.name}`.")
+          errors.add(:base, "Inventory entry not found for product `#{sales_order_item.customer_order_item.product.name}`.")
           return
         end
 
@@ -24,7 +24,7 @@ module Comee
       end
 
       def update_inventory
-        inventory = Inventory.find_by(product_id: sales_order_item.product_id)
+        inventory = Inventory.find_by(product_id: sales_order_item.customer_order_item.product_id)
         return unless quantity_changed?
 
         old_quantity = quantity_was || 0

data/db/migrate/20230811083239_create_comee_core_customer_orders.rb

@@ -0,0 +1,19 @@
+class CreateComeeCoreCustomerOrders < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_customer_orders do |t|
+      t.string :order_number, null: false
+      t.date :order_date, null: false
+      t.references :client,
+                   null: false,
+                   index: {name: "client_on_cccuo_indx"},
+                   foreign_key: {to_table: :comee_core_clients}
+      t.string :order_terms, null: false
+      t.string :delivery_address, null: false
+      t.string :invoice_address, null: false
+      t.integer :status, null: false, default: 0
+
+      t.timestamps
+    end
+    add_index :comee_core_customer_orders, :order_number, unique: true
+  end
+end

data/db/migrate/20230811102708_create_comee_core_customer_order_items.rb

@@ -0,0 +1,23 @@
+class CreateComeeCoreCustomerOrderItems < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comee_core_customer_order_items do |t|
+      t.references :customer_order,
+                   null: false,
+                   index: {name: "co_on_cccuoi_indx"},
+                   foreign_key: {to_table: :comee_core_customer_orders}
+      t.references :product,
+                   null: false,
+                   index: {name: "product_on_cccuoi_indx"},
+                   foreign_key: {to_table: :comee_core_products}
+      t.references :unit,
+                   null: false,
+                   index: {name: "unit_on_cccuoi_indx"},
+                   foreign_key: {to_table: :comee_core_units}
+      t.float :quantity, null: false, default: 0
+      t.float :price, null: false, default: 0
+      t.date :delivery_date, null: false
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230812190652_create_comee_core_sales_orders.rb

@@ -2,22 +2,16 @@ class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
   def change
     create_table :comee_core_sales_orders do |t|
       t.string :order_number, null: false
-      t.date :order_date, null: false, default: -> { "CURRENT_DATE" }
-      t.date :expected_delivery_date, null: false
-      t.references :client,
+      t.references :customer_order,
                    null: false,
-                   index: {name: "client_on_ccso_indx"},
-                   foreign_key: {to_table: :comee_core_clients}
-      t.json :client_terms
-      t.integer :payment_no_of_days, null: false, default: 0
-      t.float :payment_discount, null: false, default: 0.0
+                   index: {name: "co_on_ccso_indx"},
+                   foreign_key: {to_table: :comee_core_customer_orders}
       t.float :payment_penalty, null: false, default: 0.0
       t.integer :status, null: false, default: 0
-      t.string :delivery_address, null: false
-      t.string :invoice_address, null: false
       t.float :total_price, null: true, default: 0
       t.float :amount_paid, null: true, default: 0
-      t.float :amount_due, null: true, default: 0
+      t.string :pallete_note, null: false
+      t.date :handover_date, null: false
       t.string :remark
 
       t.timestamps

data/db/migrate/20230812212844_create_comee_core_sales_order_items.rb

@@ -3,17 +3,21 @@ class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
     create_table :comee_core_sales_order_items do |t|
       t.references :sales_order,
                    null: false,
-                   index: {name: "co_on_coi_indx"},
+                   index: {name: "so_on_ccsoi_indx"},
                    foreign_key: {to_table: :comee_core_sales_orders}
-      t.references :product,
+      t.references :unit,
                    null: false,
-                   index: {name: "po_on_coi_indx"},
-                   foreign_key: {to_table: :comee_core_products}
+                   index: {name: "unit_on_ccsoi_indx"},
+                   foreign_key: {to_table: :comee_core_units}
+      t.references :customer_order_item,
+                   null: false,
+                   index: {name: "coi_on_ccsoi_indx"},
+                   foreign_key: {to_table: :comee_core_customer_order_items}
       t.float :quantity, null: false
-      t.float :quantity_remaining
-      t.float :quantity_en_route, default: 0
+      t.float :quantity_delivered, null: false, default: 0
       t.float :price, null: false
       t.date :delivery_date, null: false
+      t.integer :eb_number
 
       t.timestamps
     end

data/db/migrate/20230813235946_create_comee_core_master_prices.rb

@@ -34,7 +34,7 @@ class CreateComeeCoreMasterPrices < ActiveRecord::Migration[7.0]
     end
 
     add_index :comee_core_master_prices,
-              %i[product_id supplier_id previous_price_id],
+              %i[product_id supplier_id previous_price_id next_price_id status],
               unique: true,
               name: "pi_si_ppi_on_ccmp_indx"
   end

data/db/migrate/20230814151601_create_comee_core_client_prices.rb

@@ -30,7 +30,7 @@ class CreateComeeCoreClientPrices < ActiveRecord::Migration[7.0]
       t.timestamps
     end
     add_index :comee_core_client_prices,
-              %i[product_id client_id previous_price_id],
+              %i[product_id client_id previous_price_id next_price_id status],
               unique: true,
               name: "pi_ci_ppi_on_cccp_indx"
   end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.39".freeze
+    VERSION = "0.1.40".freeze
   end
 end

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

@@ -0,0 +1,16 @@
+FactoryBot.define do
+  factory :customer_order_item, class: "Comee::Core::CustomerOrderItem" do
+    customer_order
+    product
+    unit
+    quantity { 1 }
+    price { 1.5 }
+    delivery_date { Date.current }
+
+    trait :with_inventory do
+      after(:create) do |item|
+        create(:inventory, product: item.product, quantity: item.quantity + 100)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,11 @@
+FactoryBot.define do
+  factory :customer_order, class: "Comee::Core::CustomerOrder" do
+    order_number { Faker::Alphanumeric.alpha(number: 8) }
+    order_date { Date.current }
+    client
+    order_terms { Faker::Lorem.sentence }
+    delivery_address { Faker::Address.full_address }
+    invoice_address { Faker::Address.full_address }
+    status { 0 }
+  end
+end

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

@@ -22,5 +22,44 @@ FactoryBot.define do
       valid_from { Date.current.advance(months: 1) }
       valid_to { Date.current.advance(months: 2) }
     end
+
+    trait :with_previous_price do
+      after(:create) do |price|
+        previous_price = build(
+          :master_price,
+          valid_from: price.valid_from.advance(months: -1),
+          valid_to: price.valid_from.advance(days: -1),
+          primary: price.primary,
+          margin: price.margin,
+          product: price.product,
+          supplier: price.supplier,
+          unit: price.unit,
+          next_price: price
+        )
+
+        price.previous_price = previous_price
+        price.save!
+        price
+      end
+    end
+
+    trait :with_next_price do
+      after(:create) do |price|
+        next_price = create(
+          :master_price,
+          valid_from: price.valid_to.advance(days: 1),
+          valid_to: price.valid_to.advance(months: 1),
+          primary: price.primary,
+          margin: price.margin,
+          product: price.product,
+          supplier: price.supplier,
+          unit: price.unit,
+          previous_price: price
+        )
+        price.next_price = next_price
+        price.save!
+        price
+      end
+    end
   end
 end

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

@@ -1,17 +1,12 @@
 FactoryBot.define do
   factory :sales_order_item, class: "Comee::Core::SalesOrderItem" do
     sales_order
-    product
+    association :customer_order_item, :with_inventory
+    unit
     quantity { 100 }
-    quantity_en_route { 0 }
-    quantity_remaining { quantity }
+    quantity_delivered { 0 }
     price { 50 }
     delivery_date { Date.current.advance(months: 1) }
-
-    trait :with_inventory do
-      after(:create) do |item|
-        create(:inventory, product: item.product, quantity: item.quantity + 100)
-      end
-    end
+    eb_number { 100 }
   end
 end

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

@@ -1,16 +1,13 @@
 FactoryBot.define do
   factory :sales_order, class: "Comee::Core::SalesOrder" do
     order_number { Faker::Alphanumeric.alpha(number: 10) }
-    order_date { Date.current }
-    expected_delivery_date { Date.current.advance(months: 1) }
-    client
-    client_terms { Faker::Lorem.sentence }
-    payment_no_of_days { 7 }
-    payment_discount { 0 }
+    customer_order
     payment_penalty { 0 }
+    total_price { 0 }
+    amount_paid { 0 }
     status { Comee::Core::SalesOrder.statuses[:draft] }
-    delivery_address { Faker::Address.full_address }
-    invoice_address { Faker::Address.full_address }
+    pallete_note { Faker::Lorem.sentence }
+    handover_date { Date.current }
     remark { Faker::Lorem.sentence }
   end
 end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :warehouse_shipment_item, class: "Comee::Core::WarehouseShipmentItem" do
-    association :sales_order_item, :with_inventory
+    sales_order_item
     warehouse_shipment
     quantity { 10 }
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.40
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-25 00:00:00.000000000 Z
+date: 2023-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -268,6 +268,8 @@ files:
 - app/models/comee/core/client_order.rb
 - app/models/comee/core/client_price.rb
 - app/models/comee/core/currency.rb
+- app/models/comee/core/customer_order.rb
+- app/models/comee/core/customer_order_item.rb
 - app/models/comee/core/edi_order.rb
 - app/models/comee/core/field_mapping.rb
 - app/models/comee/core/inventory.rb
@@ -316,6 +318,8 @@ files:
 - db/migrate/20230728123928_create_comee_core_back_orders.rb
 - db/migrate/20230728125723_create_comee_core_back_order_items.rb
 - db/migrate/20230730061225_create_comee_core_notifications.rb
+- db/migrate/20230811083239_create_comee_core_customer_orders.rb
+- db/migrate/20230811102708_create_comee_core_customer_order_items.rb
 - db/migrate/20230812190652_create_comee_core_sales_orders.rb
 - db/migrate/20230812212844_create_comee_core_sales_order_items.rb
 - db/migrate/20230813235946_create_comee_core_master_prices.rb
@@ -341,6 +345,8 @@ files:
 - spec/factories/comee/core/client_prices.rb
 - spec/factories/comee/core/clients.rb
 - spec/factories/comee/core/currencies.rb
+- spec/factories/comee/core/customer_order_items.rb
+- spec/factories/comee/core/customer_orders.rb
 - spec/factories/comee/core/edi_orders.rb
 - spec/factories/comee/core/field_mappings.rb
 - spec/factories/comee/core/inventories.rb