comee_core 0.3.50 → 0.3.53

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca617ef814088107f21ec7f2a8d541db9a58f2f8d60576aea6ef20370328a820
-  data.tar.gz: db91bf688f9d5a3479934a0839a3843e927a6b4a2b34e21ce11df5489478af37
+  metadata.gz: 04b56b87b13f305eab4e2d8b0747853c6301acba79bb249273fa032bf544f368
+  data.tar.gz: 076f1e7b830e3fd60d63107d0dfac8be2ef837e833c3bf188711bce066ce0b98
 SHA512:
-  metadata.gz: 60df1dd5ca85c8ae6b27e75d1aa5d3e30327b7366ad925a7c1443bc54e6e017064a88372d599e2d3b300c1cb17f10a8415c20dcbdb9823cb5e423792f2cda8c3
-  data.tar.gz: 8e696cdba2b0ead77fc9ecbb74c3bd1acf118b0221eee54cb047adbb4f272fbef6708857e8268c5dd5b83d1b501c3f5873bb8f3a5607f7efa90f24f69841a01c
+  metadata.gz: c54cc734056203efc08a6a9fc1eada602cf6afc8738022728ee695054b68f705ac883c9192e66e4bfcdb2c3d447df7b0fe4381350f731d7779677cbe0b9f0505
+  data.tar.gz: 10fa973af666aaed4ad2980d619773e227f7a895a01fc0b5a5c9f62baea28cfbb49ebed5152ce61968a566515af4ff37713e27b13ce4faeb438b891041cfddbf

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

@@ -104,6 +104,7 @@ module Comee
           voyage_no
           status
           payment_status
+          created_at
         ]
       end
 

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

@@ -9,6 +9,8 @@ module Comee
 
       validates :po_number, uniqueness: true
       validates :order_date, :delivery_address, :status, :delivery_date, presence: true
+      validates :discount, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100, allow_nil: true}
+      validates :confirmed_discount, numericality: {greater_than_or_equal_to: 0, less_than_or_equal_to: 100, allow_nil: true}
       enum status: {
         draft: 0,
         submitted: 1,
@@ -19,29 +21,37 @@ module Comee
       }
 
       def calculate_total_price
-        items = PurchaseOrderItem.where(purchase_order_id: id)
-        self.total_price = items.sum(&:total_price).round(2)
+        self.total_price = calculate_total
       end
 
       def calculate_confirmed_total_price
-        items = PurchaseOrderItem.where(purchase_order_id: id)
-        self.confirmed_total_price = items.sum(&:confirmed_total_price).round(2)
+        self.confirmed_total_price = calculate_confirmed_total
       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)
+        self.vat = (calculate_total * 0.19).round(2)
       end
 
       def calculate_confirmed_vat
         return unless supplier.tax_code == "Inland"
 
+        self.confirmed_vat = (calculate_confirmed_total * 0.19).round(2)
+      end
+
+      def calculate_total
+        items = PurchaseOrderItem.where(purchase_order_id: id)
+        total = items.sum(&:total_price).round(2)
+        total = (total * (1 - discount / 100.0)).round(2) if discount&.positive?
+        total
+      end
+
+      def calculate_confirmed_total
         items = PurchaseOrderItem.where(purchase_order_id: id)
-        confirmed_total_price = items.sum(&:confirmed_total_price)
-        self.confirmed_vat = (confirmed_total_price * 0.19).round(2)
+        confirmed_total = items.sum(&:confirmed_total_price).round(2)
+        confirmed_total = (confirmed_total * (1 - confirmed_discount / 100.0)).round(2) if confirmed_discount&.positive?
+        confirmed_total
       end
 
       def self.ransackable_attributes(_auth_object = nil)

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

@@ -1,7 +1,8 @@
 module Comee
   module Core
     class PurchaseOrderItemSerializer < ActiveModel::Serializer
-      attributes :id, :serial_no, :quantity, :confirmed_quantity, :price, :details, :remark
+      attributes :id, :serial_no, :purchase_order_id, :unit_id, :quantity, :confirmed_quantity, :price, :confirmed_price,
+                 :total_price, :delivery_date, :confirmed_total_price, :confirmed_delivery_date, :status, :details, :remark
 
       belongs_to :purchase_order
     end

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

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

data/db/migrate/20240815080137_add_confirmed_field_values_to_purchase_order.rb

@@ -2,5 +2,7 @@ class AddConfirmedFieldValuesToPurchaseOrder < ActiveRecord::Migration[7.1]
   def change
     add_column :comee_core_purchase_orders, :confirmed_total_price, :float, default: 0
     add_column :comee_core_purchase_orders, :confirmed_vat, :float, default: 0
+    add_column :comee_core_purchase_orders, :discount, :float, default: 0
+    add_column :comee_core_purchase_orders, :confirmed_discount, :float, default: 0
   end
 end

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.3.50".freeze
+    VERSION = "0.3.53".freeze
   end
 end

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

@@ -8,5 +8,7 @@ FactoryBot.define do
     delivery_address { "Korsu warehouse address" }
     delivery_date { Date.current.advance(days: 10) }
     terms { Faker::Lorem.sentence }
+    discount { 0 }
+    confirmed_discount { 0 }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comee_core
 version: !ruby/object:Gem::Version
-  version: 0.3.50
+  version: 0.3.53
 platform: ruby
 authors:
 - Henock L.