comee_core 0.3.15 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4b933796931ae7b24c03d2e6901df6b6f4c1b27f314b1b967eabb13da3654fd
-  data.tar.gz: f257c672d231e620f292d3ca60aadc72620ef4f5fbaa68a7dc0076cc3ddf4542
+  metadata.gz: 31d273c0f307b780445d84f77724d21676a90ecb97923b6e57452f011a31ede1
+  data.tar.gz: 8e5b700c41f8dcd22bccf746756bfdcc6669a1774622cf9f4dd03c1383a7b6a4
 SHA512:
-  metadata.gz: 24013af0d8419d7d880de21c574cfa21b39c9d70cf67dda64ed2f32a8b1b78dc90b6622c8e25fa638b7db6821e46ad43a880ab1bfabb6ef8b34b914bb0ff233d
-  data.tar.gz: 1c9e73ac25c7f40809265ba6a844f458ba51a6e0e0daadaa67c09643b9964a9f4b2ac7a8bd1c6d665a28d1a602726338d62d24ba639b50bc03d5ae90ac750d41
+  metadata.gz: d8b7269868908faea7b9fce4be61b9a9d0302a29854d29ea37948afd9c0a6ba77949aa5e241bb24ad63cd7b50faad5c2650d57d7311272c131c609511f4c0169
+  data.tar.gz: a11db8aeef2a636b16b5723c41bd8385107cf8554ddb87ddc98f1173d36fa2611619cce558194059d30e225f38b5596c704fc2f5abb5c6f5a934bdfe6c87a804

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

@@ -20,7 +20,7 @@ module Comee
       end
 
       def filter
-        data = ProductLookup.includes(:product).ransack(params[:q]).result
+        data = ProductLookup.includes(:product, :itemable).ransack(params[:q]).result
         render_content(data)
       end
 

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

@@ -2,14 +2,16 @@ module Comee
   module Core
     class AdditionalItem < ApplicationRecord
       before_save { self.total_price = unit_price * quantity }
-      after_save { invoice.update_total_price }
+      after_save :update_invoice
+      after_destroy :update_invoice
       belongs_to :invoice
 
       validates :description, presence: true
       validates :quantity, :unit_price, presence: true, numericality: {greater_than: 0}
 
-      def update_invoice_price
-        invoice.total_price = invoice.invoice_items.sum(:total_price) + invoice.additional_items.sum(:total_price)
+      def update_invoice
+        invoice.calculate_total_price
+        invoice.calculate_vat
         invoice.save!
       end
     end

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

@@ -22,9 +22,20 @@ module Comee
       delegate(:order_number, to: :sales_order, prefix: false)
       delegate(:reference_no, to: :pod, prefix: true)
 
-      def update_total_price
-        self.total_price = invoice_items.sum(:total_price) + additional_items.sum(:total_price)
-        save!
+      def calculate_total_price
+        self.total_price = calculate_total
+      end
+
+      def calculate_vat
+        return unless sales_order.client.tax_code == "Inland"
+
+        self.vat = (calculate_total * 0.19).round(2)
+      end
+
+      def calculate_total
+        items = InvoiceItem.where(invoice_id: id)
+        additionals = AdditionalItem.where(invoice_id: id)
+        items.sum(:total_price) + additionals.sum(:total_price)
       end
 
       def self.ransackable_attributes(_auth_object = nil)

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

@@ -2,7 +2,8 @@ module Comee
   module Core
     class InvoiceItem < ApplicationRecord
       before_save { self.total_price = unit_price * quantity }
-      after_save { invoice.update_total_price }
+      after_save :update_invoice
+      after_destroy :update_invoice
 
       belongs_to :shipment_instruction_item
       belongs_to :invoice
@@ -11,10 +12,11 @@ module Comee
       validates :quantity, :unit_price, presence: true, numericality: {greater_than: 0}
       validates :total_price, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
 
-      # def update_invoice_price
-      #   invoice.total_price = invoice.invoice_items.sum(:total_price) + invoice.additional_items.sum(:total_price)
-      #   invoice.save!
-      # end
+      def update_invoice
+        invoice.calculate_total_price
+        invoice.calculate_vat
+        invoice.save!
+      end
     end
   end
 end

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class PurchaseOrder < ApplicationRecord
       before_validation :generate_po_number, if: proc { |po| po.po_number.nil? }
-      before_save :total_price, :set_terms
+      before_save :set_terms
 
       belongs_to :supplier
       has_many :purchase_order_items
@@ -18,11 +18,19 @@ module Comee
         canceled: 5
       }
 
-      def total_price
+      def calculate_total_price
         items = PurchaseOrderItem.where(purchase_order_id: id)
         self.total_price = items.sum(&:total_price)
       end
 
+      def calculate_vat
+        return unless supplier.tax_code == "Inland"
+
+        items = PurchaseOrderItem.where(purchase_order_id: id)
+        total_price = items.sum(&:total_price)
+        self.vat = (total_price * 0.19).round(2)
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

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

@@ -2,6 +2,8 @@ module Comee
   module Core
     class PurchaseOrderItem < ApplicationRecord
       before_save :calculate_total_price, :calculate_confirmation_values
+      after_save :update_purchase_order
+      after_destroy :update_purchase_order
 
       has_one :purchase_order_item_diff
 
@@ -32,6 +34,12 @@ module Comee
         self.confirmed_total_price = (confirmed_price * confirmed_quantity).round(2)
       end
 
+      def update_purchase_order
+        purchase_order.calculate_total_price
+        purchase_order.calculate_vat
+        purchase_order.save!
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

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

@@ -30,18 +30,19 @@ module Comee
                 allow_nil: true
 
       def calculate_total_price
-        sales_order_items = SalesOrderItem.where(sales_order_id: id)
-        additional_services = AdditionalService.where(sales_order_id: id)
-        self.total_price = sales_order_items.sum(&:total_price) + additional_services.sum(&:total_price)
+        self.total_price = calculate_total
       end
 
       def calculate_vat
         return unless client.tax_code == "Inland"
 
-        sales_order_items = SalesOrderItem.where(sales_order_id: id)
-        additional_services = AdditionalService.where(sales_order_id: id)
-        total_price = sales_order_items.sum(&:total_price) + additional_services.sum(&:total_price)
-        self.vat = (total_price * 0.19).round(2)
+        self.vat = (calculate_total * 0.19).round(2)
+      end
+
+      def calculate_total
+        order_items = SalesOrderItem.where(sales_order_id: id)
+        services = AdditionalService.where(sales_order_id: id)
+        order_items.sum(&:total_price) + services.sum(&:total_price)
       end
 
       def set_parent_client_name

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

@@ -3,6 +3,7 @@ module Comee
     class ProductLookupSerializer < ActiveModel::Serializer
       attributes :id, :code, :itemable_id, :itemable_type, :item_description, :aliases
       belongs_to :product
+      belongs_to :itemable
     end
   end
 end

data/db/migrate/20240702151519_add_vat_to_purchase_order.rb

@@ -0,0 +1,5 @@
+class AddVatToPurchaseOrder < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_purchase_orders, :vat, :float, default: 0
+  end
+end

data/db/migrate/20240702181613_add_vat_to_invoice.rb

@@ -0,0 +1,5 @@
+class AddVatToInvoice < ActiveRecord::Migration[7.1]
+  def change
+    add_column :comee_core_invoices, :vat, :float, default: 0
+  end
+end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.15".freeze
+    VERSION = "0.3.17".freeze
   end
 end

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

@@ -5,7 +5,7 @@ FactoryBot.define do
     locale { "en" }
     payment_terms { Faker::Lorem.word }
     vat_number { Faker::Alphanumeric.alpha(number: 8) }
-    tax_code { Faker::Alphanumeric.alpha(number: 8) }
+    tax_code { "Inland" }
     user
     currency
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.17
 platform: ruby
 authors:
 - Henock L.
@@ -532,6 +532,8 @@ files:
 - db/migrate/20240630063656_add_aliases_field_to_product_lookup.rb
 - db/migrate/20240630083042_add_agent_to_pickup_schedule.rb
 - db/migrate/20240630122016_create_comee_core_additional_services.rb
+- db/migrate/20240702151519_add_vat_to_purchase_order.rb
+- db/migrate/20240702181613_add_vat_to_invoice.rb
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb