comee_core 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7530cbd96ea9cc406bcfb8ef5c890a8cdfa31d5f43c3d09c07afba8c4c0ce3c
-  data.tar.gz: e8a22cb3298284e49c74ead3edc5fe1168c03e9029f15c3a270c2d6df6414cf3
+  metadata.gz: e3e105a8c7e7254936a7db749a048935e743a23d2098650380a34a8bf55bc620
+  data.tar.gz: f38e93115c2d99cb771e261a16b86183b4a06dc497f937b67be1af502f1f9d0d
 SHA512:
-  metadata.gz: 463c027f00ad2b09037e091b4fe2cdbfc5b0139c9f3856f81e8f3dde30bf88c3cf1e23d70a56c2acee2f122d7e4ece7d83ade7b9713736b92e1ee7ce62684f95
-  data.tar.gz: 4f6b18b777eaeff508c4c00e23396d9ab1abf740fde0cb155abf00ee2d2ba99eba9d8fbef882b41b0eafea779f1205cc8c08cff0a0ee92308b3e8ddc39e16aea
+  metadata.gz: 136ec7b8f11718c0822ccacb0177c39e602a95e0b182f136a5cead06b11e06ffb8df5924aa2671841eb00f889bbaf794578444b06c92b305b739cca4bc77008e
+  data.tar.gz: 49ddfc65ef76c8c0fef5a0cf51e9d881f0eb621afa04a6f61dea4b89f0d914bde27a6cdc3b1d1d8952885dc30ddffbb9444bd277c76705faef6d7f4484786781

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

@@ -15,6 +15,14 @@ module Comee
         period = Period.new(valid_from, valid_to)
         errors.add(:base, "Price validity date range is not correct.") unless period.valid?
       end
+
+      def self.ransackable_attributes(auth_object = nil)
+        ["valid_from", "valid_to", "new_price", "old_price", "product_id", "client_id"]
+      end
+
+      def self.ransackable_associations(auth_object = nil)
+        []
+      end
     end
   end
 end

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

@@ -2,9 +2,11 @@ module Comee
   module Core
     class Invoice < ApplicationRecord
       before_save :update_invoice_total
-      belongs_to :client_order
+      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}
 
@@ -12,7 +14,7 @@ module Comee
       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: :client_order)
+      delegate(:order_number, to: :sales_order)
 
       def update_invoice_total
         self.additional_charges ||= 0
@@ -23,7 +25,7 @@ module Comee
 
       def self.ransackable_attributes(auth_object = nil)
         [
-          "client_order_id",
+          "sales_order_id",
           "invoice_no",
           "date_issued",
           "ship_name",
@@ -35,7 +37,7 @@ module Comee
       end
 
       def self.ransackable_associations(auth_object = nil)
-        []
+        ["sales_order"]
       end
     end
   end

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

@@ -4,14 +4,14 @@ module Comee
       before_save { self.total_price = unit_price * quantity }
       after_save :update_invoice_total
 
-      belongs_to :client_order_item
+      belongs_to :sales_order_item
       belongs_to :invoice
 
       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: :client_order_item)
-      delegate(:product_name, to: :client_order_item)
+      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

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

@@ -0,0 +1,36 @@
+module Comee
+  module Core
+    class SalesOrder < ApplicationRecord
+      belongs_to :client
+      has_many :sales_order_items
+
+      enum :status, {draft: 0, confirmed: 1}
+
+      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,
+        presence: true,
+        numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100}
+
+      delegate(:name, to: :client, prefix: true)
+
+      def self.ransackable_attributes(auth_object = nil)
+        [
+          "delivery_address",
+          "expected_delivery_date",
+          "invoice_address",
+          "order_date",
+          "order_number",
+          "status",
+          "client_id"
+        ]
+      end
+
+      def self.ransackable_associations(auth_object = nil)
+        []
+      end
+    end
+  end
+end

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

@@ -0,0 +1,20 @@
+module Comee
+  module Core
+    class SalesOrderItem < ApplicationRecord
+      before_validation :set_delivery_date, if: proc { delivery_date.nil? }
+
+      belongs_to :sales_order
+      belongs_to :product
+
+      validates :delivery_date, presence: true
+      validates :quantity, :price, presence: true, 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
+    end
+  end
+end

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

@@ -5,7 +5,7 @@ module Comee
       ##
       # This method returns a translated code for a given +code+. The +code+ can be
       # for a supplier or a client. The source of the +code+ is described using the +from+
-      # parameter. The +from+ parameter is a has which specifies the id of the source
+      # parameter. The +from+ parameter is a hash which specifies the id of the source
       # supplier/client as `itemable_id`, and the data type of the source as itemable_type.
       # We specify the id and type because the ProductLookup model has a polymorphic relationship
       # with supplier and client.

data/db/migrate/{20230812190652_create_comee_core_client_orders.rb → 20230812190652_create_comee_core_sales_orders.rb}

@@ -1,24 +1,27 @@
-class CreateComeeCoreClientOrders < ActiveRecord::Migration[7.0]
+class CreateComeeCoreSalesOrders < ActiveRecord::Migration[7.0]
   def change
-    create_table :comee_core_client_orders do |t|
+    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 :delivery_date, null: false
+      t.date :expected_delivery_date, null: false
       t.references :client,
         null: false,
         index: {name: "client_on_ccco_indx"},
         foreign_key: {to_table: :comee_core_clients}
-      t.json :terms
+      t.json :client_terms
+      t.integer :payment_no_of_days, null: false, default: 0
+      t.float :payment_discount, null: false, default: 0.0
+      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.string :remark
       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 :remark
 
       t.timestamps
     end
-    add_index :comee_core_client_orders, :order_number, unique: true
+    add_index :comee_core_sales_orders, :order_number, unique: true
   end
 end

data/db/migrate/{20230812212844_create_comee_core_client_order_items.rb → 20230812212844_create_comee_core_sales_order_items.rb}

@@ -1,16 +1,17 @@
-class CreateComeeCoreClientOrderItems < ActiveRecord::Migration[7.0]
+class CreateComeeCoreSalesOrderItems < ActiveRecord::Migration[7.0]
   def change
-    create_table :comee_core_client_order_items do |t|
-      t.references :client_order,
+    create_table :comee_core_sales_order_items do |t|
+      t.references :sales_order,
         null: false,
         index: {name: "co_on_coi_indx"},
-        foreign_key: {to_table: :comee_core_client_orders}
+        foreign_key: {to_table: :comee_core_sales_orders}
       t.references :product,
         null: false,
         index: {name: "po_on_coi_indx"},
         foreign_key: {to_table: :comee_core_products}
       t.integer :quantity, null: false
       t.integer :price, null: false
+      t.date :delivery_date, null: false
 
       t.timestamps
     end

data/db/migrate/20230915205522_create_comee_core_invoices.rb

@@ -2,10 +2,10 @@ class CreateComeeCoreInvoices < ActiveRecord::Migration[7.0]
   def change
     create_table :comee_core_invoices do |t|
       t.string :invoice_no, null: false
-      t.references :client_order,
+      t.references :sales_order,
         null: false,
         index: {name: "co_on_cci_indx"},
-        foreign_key: {to_table: :comee_core_client_orders}
+        foreign_key: {to_table: :comee_core_sales_orders}
       t.date :date_issued, null: false
       t.string :ship_name
       t.date :delivery_date

data/db/migrate/20230915205648_create_comee_core_invoice_items.rb

@@ -1,10 +1,10 @@
 class CreateComeeCoreInvoiceItems < ActiveRecord::Migration[7.0]
   def change
     create_table :comee_core_invoice_items do |t|
-      t.references :client_order_item,
+      t.references :sales_order_item,
         null: false,
-        index: {name: "coi_on_ccii_indx"},
-        foreign_key: {to_table: :comee_core_client_order_items}
+        index: {name: "soi_on_ccii_indx"},
+        foreign_key: {to_table: :comee_core_sales_order_items}
       t.float :quantity, null: false
       t.float :unit_price, null: false
       t.float :total_price, null: false

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.1.12"
+    VERSION = "0.1.13"
   end
 end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :invoice_item, class: "Comee::Core::InvoiceItem" do
-    client_order_item
+    sales_order_item
     quantity { 10 }
     unit_price { 5 }
     total_price { 50 }

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

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :invoice, class: "Comee::Core::Invoice" do
     invoice_no { Faker::Alphanumeric.alpha(number: 8) }
-    client_order
+    sales_order
     date_issued { Date.current }
     ship_name { Faker::Name.name }
     delivery_date { Date.current.advance(days: -7) }

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

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :sales_order_item, class: "Comee::Core::SalesOrderItem" do
+    sales_order
+    product
+    quantity { 100 }
+    price { 50 }
+    delivery_date { Date.current.advance(month: 1) }
+  end
+end

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

@@ -0,0 +1,16 @@
+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(month: 1) }
+    client
+    client_terms { Faker::Lorem.sentence }
+    payment_no_of_days { 7 }
+    payment_discount { 0 }
+    payment_penalty { 0 }
+    status { Comee::Core::SalesOrder.statuses[:draft] }
+    delivery_address { Faker::Address.full_address }
+    invoice_address { Faker::Address.full_address }
+    remark { Faker::Lorem.sentence }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-09-18 00:00:00.000000000 Z
+date: 2023-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -248,8 +248,6 @@ files:
 - app/models/comee/core/back_order.rb
 - app/models/comee/core/back_order_item.rb
 - app/models/comee/core/client.rb
-- app/models/comee/core/client_order.rb
-- app/models/comee/core/client_order_item.rb
 - app/models/comee/core/client_price.rb
 - app/models/comee/core/currency.rb
 - app/models/comee/core/invoice.rb
@@ -259,6 +257,8 @@ files:
 - app/models/comee/core/product.rb
 - app/models/comee/core/product_lookup.rb
 - app/models/comee/core/product_type.rb
+- app/models/comee/core/sales_order.rb
+- app/models/comee/core/sales_order_item.rb
 - app/models/comee/core/supplier.rb
 - app/models/comee/core/unit.rb
 - app/models/comee/core/user.rb
@@ -290,8 +290,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/20230812190652_create_comee_core_client_orders.rb
-- db/migrate/20230812212844_create_comee_core_client_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
 - db/migrate/20230814151601_create_comee_core_client_prices.rb
 - db/migrate/20230914041307_create_comee_core_external_products.rb
@@ -304,8 +304,6 @@ files:
 - lib/tasks/comee_core_tasks.rake
 - spec/factories/comee/core/back_order_items.rb
 - spec/factories/comee/core/back_orders.rb
-- spec/factories/comee/core/client_order_items.rb
-- spec/factories/comee/core/client_orders.rb
 - spec/factories/comee/core/client_prices.rb
 - spec/factories/comee/core/clients.rb
 - spec/factories/comee/core/currencies.rb
@@ -316,6 +314,8 @@ files:
 - spec/factories/comee/core/product_lookups.rb
 - spec/factories/comee/core/product_types.rb
 - spec/factories/comee/core/products.rb
+- spec/factories/comee/core/sales_order_items.rb
+- spec/factories/comee/core/sales_orders.rb
 - spec/factories/comee/core/suppliers.rb
 - spec/factories/comee/core/units.rb
 - spec/factories/comee/core/users.rb
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: An engine for the COMee ERP.

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

@@ -1,23 +0,0 @@
-module Comee
-  module Core
-    class ClientOrder < ApplicationRecord
-      belongs_to :client
-      has_many :client_order_items
-
-      enum :status, {draft: 0, confirmed: 1}
-
-      validates :order_number, presence: true, uniqueness: true
-      validates :order_date, :delivery_date, :terms, :delivery_address, :invoice_address, :status, presence: true
-
-      delegate(:name, to: :client, prefix: true)
-
-      def self.ransackable_attributes(auth_object = nil)
-        ["delivery_address", "delivery_date", "invoice_address", "order_date", "order_number", "status", "client_id"]
-      end
-
-      def self.ransackable_associations(auth_object = nil)
-        []
-      end
-    end
-  end
-end

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

@@ -1,13 +0,0 @@
-module Comee
-  module Core
-    class ClientOrderItem < ApplicationRecord
-      belongs_to :client_order
-      belongs_to :product
-
-      validates :quantity, :price, presence: true, numericality: {greater_than: 0}
-
-      delegate(:name, to: :product, prefix: true)
-      delegate(:code, to: :product, prefix: true)
-    end
-  end
-end

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

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :client_order_item, class: "Comee::Core::ClientOrderItem" do
-    client_order
-    product
-    quantity { 100 }
-    price { 50 }
-  end
-end

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

@@ -1,13 +0,0 @@
-FactoryBot.define do
-  factory :client_order, class: "Comee::Core::ClientOrder" do
-    order_number { Faker::Alphanumeric.alpha(number: 10) }
-    order_date { Date.current }
-    delivery_date { Date.current.advance(month: 1) }
-    client
-    terms { {payment_terms: "NET 30 days", currency: "Euro", freight_terms: "FOB"} }
-    status { Comee::Core::ClientOrder.statuses[:draft] }
-    delivery_address { Faker::Address.full_address }
-    invoice_address { Faker::Address.full_address }
-    remark { Faker::Lorem.sentence }
-  end
-end