comee_core 0.2.77 → 0.2.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67f60892b641a96e68c79d6abad6c4a2d22c6d1f0f8b5f146868045b25dc854d
-  data.tar.gz: eb47395320794e11719f4ade052386c16c4f860c2ee963a80afb92f995ca5314
+  metadata.gz: c856b39462e1a5e71b4e0398036d1daa01f60d79164a64f990bc5c7bdc9e34ca
+  data.tar.gz: 52c91c793ac39d46498947f1a6029e033bb1d783b26a95ff263a183f593bb87d
 SHA512:
-  metadata.gz: 93a6951c69e987c7c7fde0a7468e159dba7e2dae57890a899d998b90fe1809e8a7e372f0360cc08b1b8ff02316d3e2e628fa7e3ce7ae8b8cca009a5ef5542394
-  data.tar.gz: 8b16d2e2b22c9e7b76a799d6404a5378f6992aede3fdb025be7daf8622d3045149aef7a7812e11b2dffc17b727a15bd1d950e0982612c2236c69d5e4631d3951
+  metadata.gz: ddaf17d4909e3acbf5c59553e4b1f06c49997df81b8aaab402bfb47065feca08a6dc88d50f321c0ad28f8dd42dda47e57417fe0bd6fc09b971ccf6eebc49c467
+  data.tar.gz: 72716a00dd82da58da08db687205b4a20f4194fd6d815481a04b99089f0de8cc8647d50d41be62c1054f306989fcf45f62af1dbef53b156b0243f71f0b1f1001

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

@@ -17,7 +17,7 @@ module Comee
       private
 
       def model_params
-        params.require(:payload).permit(:code, :name, :address, :locale, :payment_terms, :currency_id)
+        params.require(:payload).permit(:code, :name, :address, :locale, :payment_terms, :currency_id, :vat_number, :tax_code)
       end
     end
   end

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

@@ -1,6 +1,8 @@
 module Comee
   module Core
     class Invoice < ApplicationRecord
+      before_validation :generate_invoice_no, if: proc { |inv| inv.invoice_no.nil? }
+
       belongs_to :sales_order
       belongs_to :pod
       has_many :invoice_items
@@ -12,7 +14,7 @@ module Comee
       enum :status, {draft: 0, approved: 1, issued: 2}
       enum :payment_status, {not_paid: 0, partially_paid: 1, fully_paid: 2, overpaid: 3}
 
-      validates :invoice_no, presence: true, uniqueness: true
+      validates :invoice_no, uniqueness: true
       validates :status, :payment_status, presence: true
       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}
@@ -42,6 +44,10 @@ module Comee
       def self.ransackable_associations(_auth_object = nil)
         ["sales_order"]
       end
+
+      def generate_invoice_no
+        self.invoice_no = Util.generate_number("Invoice", "invoice_no")
+      end
     end
   end
 end

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

@@ -1,12 +1,13 @@
 module Comee
   module Core
     class PurchaseOrder < ApplicationRecord
-      before_save :total_price
+      before_validation :generate_po_number, if: proc { |po| po.po_number.nil? }
+      before_save :total_price, :set_terms
 
       belongs_to :supplier
       has_many :purchase_order_items
 
-      validates :po_number, presence: true, uniqueness: true
+      validates :po_number, uniqueness: true
       validates :order_date, :delivery_address, :status, :delivery_date, presence: true
       enum status: {
         draft: 0,
@@ -32,12 +33,23 @@ module Comee
           status
           delivery_address
           delivery_date
+          order_reference
         ]
       end
 
+      def generate_po_number
+        self.po_number = Util.generate_number("PurchaseOrder", "po_number")
+      end
+
       def self.ransackable_associations(_auth_object = nil)
         %w[supplier unit]
       end
+
+      def set_terms
+        return if terms
+
+        self.terms = supplier.payment_terms
+      end
     end
   end
 end

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

@@ -1,14 +1,14 @@
 module Comee
   module Core
     class PurchaseRequisition < ApplicationRecord
-      # before_save :calculate_total_price
+      before_validation :generate_requisition_no, if: proc { |pr| pr.requisition_no.nil? }
 
       has_many :purchase_requisition_items
 
       enum :status, {draft: 0, submitted: 1, approved: 2, rejected: 3}
       enum :purchase_status, {unprocessed: 0, processed: 1}
 
-      validates :requisition_no, presence: true, uniqueness: true
+      validates :requisition_no, uniqueness: true
       validates :requisition_date, :status, :purchase_status, presence: true
 
       def self.ransackable_attributes(_auth_object = nil)
@@ -23,6 +23,10 @@ module Comee
         items = PurchaseRequisitionItem.where(purchase_requisition_id: id)
         self.total_price = items.sum(&:total_price)
       end
+
+      def generate_requisition_no
+        self.requisition_no = Util.generate_number("PurchaseRequisition", "requisition_no")
+      end
     end
   end
 end

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

@@ -1,6 +1,8 @@
 module Comee
   module Core
     class SalesOrder < ApplicationRecord
+      before_validation :generate_order_number, if: proc { |so| so.order_number.nil? }
+
       before_save :total_price
       before_save :set_parent_client_name
 
@@ -49,6 +51,10 @@ module Comee
       def files_url
         files.attached? ? files.map { |file| Rails.application.routes.url_helpers.rails_blob_url(file, only_path: false) } : []
       end
+
+      def generate_order_number
+        self.order_number = Util.generate_number("SalesOrder", "order_number")
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class PurchaseOrderSerializer < ActiveModel::Serializer
       attributes :id, :po_number, :supplier_id, :order_date, :status, :delivery_address, :delivery_date, :terms, :total_price,
-                 :created_at, :updated_at
+                 :order_reference, :created_at, :updated_at
       belongs_to :supplier
     end
   end

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

@@ -1,7 +1,7 @@
 module Comee
   module Core
     class SupplierSerializer < ActiveModel::Serializer
-      attributes :id, :code, :name, :address, :locale, :user_id, :payment_terms
+      attributes :id, :code, :name, :address, :locale, :user_id, :payment_terms, :tax_code, :vat_number
       belongs_to :currency
     end
   end

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

@@ -139,7 +139,6 @@ module Comee
         sales_order = nil
         CustomerOrder.transaction do
           sales_order = SalesOrder.create!(
-            order_number: order.order_number,
             order_date: order.order_date,
             customer_order: order,
             status: SalesOrder.statuses[:draft],

data/app/utils/comee/core/util.rb

@@ -0,0 +1,24 @@
+module Comee
+  module Core
+    class Util
+      # This method generates document numbers with a certain prefix
+      # and a serial suffix
+      def self.generate_number(clz, field)
+        clz_hash = {
+          "PurchaseRequisition" => "PR",
+          "PurchaseOrder" => "PO",
+          "Invoice" => "IN",
+          "SalesOrder" => "SO"
+        }
+        clazz_name = "Comee::Core::#{clz}"
+        clazz = clazz_name.constantize
+        last = clazz.last
+
+        return "#{clz_hash[clz]}1" unless last
+
+        num = last.send(field)[2..].to_i
+        "#{clz_hash[clz]}#{num + 1}"
+      end
+    end
+  end
+end

data/db/migrate/20240602171355_add_order_reference_to_purchase_order.rb

@@ -0,0 +1,5 @@
+class AddOrderReferenceToPurchaseOrder < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_purchase_orders, :order_reference, :string, null: true
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.77".freeze
+    VERSION = "0.2.80".freeze
   end
 end

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :invoice, class: "Comee::Core::Invoice" do
-    invoice_no { Faker::Alphanumeric.alpha(number: 8) }
+    invoice_no { nil }
     sales_order
     pod
     date_issued { Date.current }

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

@@ -1,6 +1,7 @@
 FactoryBot.define do
   factory :purchase_order, class: "Comee::Core::PurchaseOrder" do
-    po_number { Faker::Alphanumeric.alpha(number: 20) }
+    po_number { nil }
+    order_reference { Faker::Alphanumeric.alpha(number: 8) }
     supplier
     order_date { Date.current }
     status { 0 }

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :purchase_requisition, class: "Comee::Core::PurchaseRequisition" do
-    requisition_no { Faker::Alphanumeric.alpha(number: 10) }
+    requisition_no { nil } # { Faker::Alphanumeric.alpha(number: 10) }
     requisition_date { Date.current }
     delivery_date { Date.current.advance(days: 10) }
     remark { Faker::Lorem.sentence }

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :sales_order, class: "Comee::Core::SalesOrder" do
-    order_number { Faker::Alphanumeric.alpha(number: 10) }
+    order_number { nil }
     order_date { Date.current }
     customer_order
     fulfillment_center

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.2.77
+  version: 0.2.80
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-06-01 00:00:00.000000000 Z
+date: 2024-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -402,6 +402,7 @@ files:
 - app/services/comee/core/sales_order_service.rb
 - app/services/comee/core/token_service.rb
 - app/utils/comee/core/period.rb
+- app/utils/comee/core/util.rb
 - app/validators/array_validator.rb
 - app/views/comee/core/supplier_mailer/new_order_notification.html.erb
 - app/views/layouts/comee/core/mailer.html.erb
@@ -471,6 +472,7 @@ files:
 - db/migrate/20240503040722_create_comee_core_client_addresses.rb
 - db/migrate/20240515173010_add_serial_no_to_line_items.rb
 - db/migrate/20240601094028_add_additional_fields.rb
+- db/migrate/20240602171355_add_order_reference_to_purchase_order.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb