comee_core 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3fd565d7b087866c90b6e231dbf65f6bf1e36b4c951290541c083cc0ec0b26b
-  data.tar.gz: 9eb535c0bc7026c7b411593eeb2a41d98f4ff82cdeb59dd343bf41fee3d0b302
+  metadata.gz: 31d273c0f307b780445d84f77724d21676a90ecb97923b6e57452f011a31ede1
+  data.tar.gz: 8e5b700c41f8dcd22bccf746756bfdcc6669a1774622cf9f4dd03c1383a7b6a4
 SHA512:
-  metadata.gz: bd271add8709246848ba0b1d469596f4cedd58bd041f94ac83f174ffa88243d8420257471cdb5c137cb2c60ba7e2887d052cd30dd8aa637bebfbd24b92377038
-  data.tar.gz: b0b8e23964ecf2dd275cb9b8d71302f11783703d33be52efceb5c6193bece0cefaf58c91ec0929dfe2ded532cde2857d15aafb1ca3a863d0e43885774c0091a6
+  metadata.gz: d8b7269868908faea7b9fce4be61b9a9d0302a29854d29ea37948afd9c0a6ba77949aa5e241bb24ad63cd7b50faad5c2650d57d7311272c131c609511f4c0169
+  data.tar.gz: a11db8aeef2a636b16b5723c41bd8385107cf8554ddb87ddc98f1173d36fa2611619cce558194059d30e225f38b5596c704fc2f5abb5c6f5a934bdfe6c87a804

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/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/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.16".freeze
+    VERSION = "0.3.17".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - Henock L.
@@ -533,6 +533,7 @@ files:
 - 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