comee_core 0.3.33 → 0.3.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c589c25e5e2b41ad83a56f366e896c5b7faf3688a83c9f5374fb32da59b627
-  data.tar.gz: 1bf5521076bda84877681a8332fcd2164b3cd44f7b45e06e9cf77e07dcfbfb5d
+  metadata.gz: 9971c642206d96b99ecbda1d612bd2386dbefc6730f8a3e7f23def6361c78ffd
+  data.tar.gz: d9bd7b9810239fcf374985e89c547bf34c6281535894ac6b436a6119632b6f57
 SHA512:
-  metadata.gz: 638fe7dbf70fff745c9141b57f436788d77ae03d2fd9ae684181504d3e9a5a024c65ce59cc7cbf4d85ba30b1bc3eabc2b2ea3706a00e76619a02f644d756f89a
-  data.tar.gz: f81537b7037404f9ab7d4a911cee199b2909c33d7a021668a44864baa92d2dbbbe1130b1301fab00df96bc7b14b111c3d2d0e8a312c6ffae4baf47a9a7cc6494
+  metadata.gz: d0882a7a03c3df0a1ba03ea4adce54275646b98eb479fb5194bde80d2582f97b50fa325cda9342211947bc47b3f3cb48079b787cd7392bc0617654046849eb29
+  data.tar.gz: 1614c0c02b6078704698662d5578557c1379ef1e99a1f0fc3fe88b6072f95ad2caa24cdb597c80c24937c13aca527e766dde9caa325e5de1da34b29afc54fbe6

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

@@ -43,6 +43,7 @@ module Comee
                 :serial_no,
                 :customer_item_no,
                 :customer_item_description,
+                :customer_item_alias,
                 :quantity,
                 :price,
                 :total_price,
@@ -50,7 +51,8 @@ module Comee
                 :canceled,
                 :product_id,
                 :customer_order_id,
-                :unit_id
+                :unit_id,
+                :use_alias
               )
       end
     end

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

@@ -99,9 +99,9 @@ module Comee
       def model_params
         params.require(:payload)
               .permit(:sales_order_id, :customer_order_item_id, :product_id, :unit_id, :quantity, :quantity_delivered,
-                      :serial_no, :quantity_canceled, :customer_item_no, :customer_item_description, :price, :handover_date,
-                      :delivery_date, :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id, :pallet_no,
-                      :source_id, :processing_status)
+                      :serial_no, :quantity_canceled, :customer_item_no, :customer_item_description, :customer_item_alias,
+                      :use_alias, :price, :handover_date, :delivery_date, :eb_number, :lead_time, :comment, :action_note,
+                      :purchase_order_item_id, :pallet_no, :source_id, :processing_status)
       end
 
       def cancel_quantity_params

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

@@ -1,10 +1,16 @@
 module Comee
   module Core
     class DeliveryNote < ApplicationRecord
+      before_validation :generate_reference_no, if: proc { |dn| dn.reference_no.nil? }
+
       belongs_to :pod
       has_many :shipment_instruction_items
 
-      validates :reference_no, presence: true
+      validates :reference_no, presence: true, uniqueness: true
+
+      def generate_reference_no
+        self.reference_no = Util.generate_number("DeliveryNote", "reference_no", "DN")
+      end
     end
   end
 end

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

@@ -2,6 +2,7 @@ module Comee
   module Core
     class Invoice < ApplicationRecord
       before_validation :generate_invoice_no, if: proc { |inv| inv.invoice_no.nil? }
+      before_save :calculate_due_date, unless: proc { |inv| inv.date_issued.nil? }
 
       belongs_to :sales_order
       belongs_to :pod
@@ -14,7 +15,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, uniqueness: true
+      validates :invoice_no, uniqueness: {case_sensitive: false}
       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}
@@ -32,6 +33,10 @@ module Comee
         self.vat = (calculate_total * 0.19).round(2)
       end
 
+      def calculate_due_date
+        self.due_date = date_issued + 30.days
+      end
+
       def calculate_total
         items = InvoiceItem.where(invoice_id: id)
         additionals = AdditionalItem.where(invoice_id: id)
@@ -57,7 +62,8 @@ module Comee
       end
 
       def generate_invoice_no
-        self.invoice_no = Util.generate_number("Invoice", "invoice_no")
+        year = Date.current.year.to_s
+        self.invoice_no = Util.generate_number("Invoice", "invoice_no", year, "-", 100001)
       end
     end
   end

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

@@ -46,7 +46,7 @@ module Comee
       end
 
       def generate_po_number
-        self.po_number = Util.generate_number("PurchaseOrder", "po_number")
+        self.po_number = Util.generate_number("PurchaseOrder", "po_number", "PO")
       end
 
       def self.ransackable_associations(_auth_object = nil)

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

@@ -25,7 +25,7 @@ module Comee
       end
 
       def generate_requisition_no
-        self.requisition_no = Util.generate_number("PurchaseRequisition", "requisition_no")
+        self.requisition_no = Util.generate_number("PurchaseRequisition", "requisition_no", "PR")
       end
     end
   end

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

@@ -80,7 +80,7 @@ module Comee
       end
 
       def generate_order_number
-        self.order_number = Util.generate_number("SalesOrder", "order_number")
+        self.order_number = Util.generate_number("SalesOrder", "order_number", "SO")
       end
     end
   end

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

@@ -1,8 +1,8 @@
 module Comee
   module Core
     class CustomerOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :serial_no, :customer_item_no, :customer_item_description, :quantity, :price, :total_price, :delivery_date,
-                 :canceled, :customer_order_id, :product_id, :unit_id
+      attributes :id, :serial_no, :customer_item_no, :customer_item_description, :customer_item_alias, :use_alias,
+                 :quantity, :price, :total_price, :delivery_date, :canceled, :customer_order_id, :product_id, :unit_id
       belongs_to :product
       belongs_to :unit
       belongs_to :customer_order

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

@@ -1,9 +1,10 @@
 module Comee
   module Core
     class SalesOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :serial_no, :customer_item_no, :customer_item_description, :quantity, :quantity_delivered, :quantity_canceled,
-                 :price, :handover_date, :delivery_date, :eb_number, :lead_time, :comment, :action_note, :purchase_order_item_id,
-                 :price_diff, :quantity_diff, :total_price, :canceled, :processing_status, :additional_details, :created_at
+      attributes :id, :serial_no, :customer_item_no, :customer_item_description, :customer_item_alias, :use_alias, :quantity,
+                 :quantity_delivered, :quantity_canceled, :price, :handover_date, :delivery_date, :eb_number, :lead_time,
+                 :comment, :action_note, :purchase_order_item_id, :price_diff, :quantity_diff, :total_price, :canceled,
+                 :processing_status, :additional_details, :created_at
       belongs_to :sales_order
       belongs_to :customer_order_item
       belongs_to :source

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

@@ -217,6 +217,7 @@ module Comee
               delivery_date: item.delivery_date,
               handover_date: order.handover_date,
               lead_time: master_price&.lead_time,
+              use_alias: item.use_alias,
               additional_details: {
                 supplier_id: master_price.supplier_id,
                 supplier_name: master_price.supplier.name,

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

@@ -3,21 +3,28 @@ module Comee
     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"
-        }
+      def self.generate_number(clz, field, prefix, sep = nil, start = 1)
+        # clz_hash = {
+        #   "PurchaseRequisition" => "PR",
+        #   "PurchaseOrder" => "PO",
+        #   "Invoice" => "IN",
+        #   "SalesOrder" => "SO",
+        #   "DeliveryNote" => "DN"
+        # }
         clazz_name = "Comee::Core::#{clz}"
         clazz = clazz_name.constantize
         last = clazz.last
 
-        return "#{clz_hash[clz]}1" unless last
+        return "#{prefix}#{sep}#{start}" unless last
 
-        num = last.send(field)[2..].to_i
-        "#{clz_hash[clz]}#{num + 1}"
+        index = prefix.length
+        val = last.send(field)
+        pref = val.slice(0, index)
+        suff = sep ? val.slice(index + 1, val.length).to_i : val.slice(index, val.length).to_i
+
+        return "#{prefix}#{sep}#{start}" unless prefix == pref
+
+        "#{prefix}#{sep}#{suff + 1}"
       end
     end
   end

data/db/migrate/20240720091730_add_use_alias_field_to_line_items.rb

@@ -0,0 +1,6 @@
+class AddUseAliasFieldToLineItems < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_customer_order_items, :use_alias, :boolean, default: false
+    add_column :comee_core_sales_order_items, :use_alias, :boolean, default: false
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.33".freeze
+    VERSION = "0.3.34".freeze
   end
 end

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

@@ -6,11 +6,13 @@ FactoryBot.define do
     unit
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
     customer_item_description { Faker::Lorem.sentence }
+    customer_item_alias { Faker::Alphanumeric.alpha(number: 10) }
     quantity { 1 }
     price { 1.5 }
     total_price { quantity * price }
     delivery_date { Date.current }
     canceled { false }
+    use_alias { false }
 
     trait :with_inventory do
       after(:create) do |item|

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

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :delivery_note, class: "Comee::Core::DeliveryNote" do
     pod
-    reference_no { Faker::Alphanumeric.alpha(number: 10) }
+    reference_no { nil }
   end
 end

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

@@ -10,6 +10,7 @@ FactoryBot.define do
     customer_item_no { Faker::Alphanumeric.alpha(number: 10) }
     customer_item_alias { Faker::Alphanumeric.alpha(number: 10) }
     customer_item_description { Faker::Lorem.sentence }
+    use_alias { false }
     quantity { customer_order_item.quantity }
     quantity_diff { 0 }
     quantity_delivered { 0 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.33
+  version: 0.3.34
 platform: ruby
 authors:
 - Henock L.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-18 00:00:00.000000000 Z
+date: 2024-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -526,6 +526,7 @@ files:
 - db/migrate/20240630122016_create_comee_core_additional_services.rb
 - db/migrate/20240716143922_add_customer_item_alias_to_customer_and_sales_order.rb
 - db/migrate/20240718103456_make_delivery_note_no_and_goods_issue_date_optional.rb
+- db/migrate/20240720091730_add_use_alias_field_to_line_items.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb