comee_core 0.3.15 → 0.3.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4b933796931ae7b24c03d2e6901df6b6f4c1b27f314b1b967eabb13da3654fd
-  data.tar.gz: f257c672d231e620f292d3ca60aadc72620ef4f5fbaa68a7dc0076cc3ddf4542
+  metadata.gz: b3fd565d7b087866c90b6e231dbf65f6bf1e36b4c951290541c083cc0ec0b26b
+  data.tar.gz: 9eb535c0bc7026c7b411593eeb2a41d98f4ff82cdeb59dd343bf41fee3d0b302
 SHA512:
-  metadata.gz: 24013af0d8419d7d880de21c574cfa21b39c9d70cf67dda64ed2f32a8b1b78dc90b6622c8e25fa638b7db6821e46ad43a880ab1bfabb6ef8b34b914bb0ff233d
-  data.tar.gz: 1c9e73ac25c7f40809265ba6a844f458ba51a6e0e0daadaa67c09643b9964a9f4b2ac7a8bd1c6d665a28d1a602726338d62d24ba639b50bc03d5ae90ac750d41
+  metadata.gz: bd271add8709246848ba0b1d469596f4cedd58bd041f94ac83f174ffa88243d8420257471cdb5c137cb2c60ba7e2887d052cd30dd8aa637bebfbd24b92377038
+  data.tar.gz: b0b8e23964ecf2dd275cb9b8d71302f11783703d33be52efceb5c6193bece0cefaf58c91ec0929dfe2ded532cde2857d15aafb1ca3a863d0e43885774c0091a6

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/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/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/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.15".freeze
+    VERSION = "0.3.16".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.16
 platform: ruby
 authors:
 - Henock L.
@@ -532,6 +532,7 @@ 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
 - lib/comee/core.rb
 - lib/comee/core/engine.rb
 - lib/comee/core/version.rb