comee_core 0.2.47 → 0.2.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d634ab9d176cff8de70d3f9773017f390827ba6819d0201801fd23b316c3ec2
-  data.tar.gz: 364538a72a9bf036f947f2391efe2854ca1e89cce87eccb7c4ca615b295306b7
+  metadata.gz: 067fb1956bf9f0c318d443ac1bc3e57c92b98a7db3afcdaf0a4d0869a5df7989
+  data.tar.gz: c70a6b57d486b4029dc66f4e07e3d8dce94ab3695b0623a582e8e5573e9b1120
 SHA512:
-  metadata.gz: '0538cffa099fcf9b7d423ce3e6815ab64f9570355ed65240cd56427d648a930b1c355fdc57003739d16435773d764409d59d038121a1ff194a5a07341db0fab1'
-  data.tar.gz: a94b47936abb583cd19448363a22144ad976cffdf16e7b3a2256b1ac7d9bce9d869fe6289ddf313844680dbfbae46bcfa594db153b6d4994da28469da97e5462
+  metadata.gz: d3ac1e81c9d58317182cd37e470e4f92516201bddf1d77fc2c5e5412b045dfc340d8c55b6dea389f07059fc6c683bc825d1b25a23102dbbd319f83317e80d26e
+  data.tar.gz: 943ec3ba980dbdfe273afa930fa30f7ad6200ff5085ee6552aec2af978012e8a933e23a0dacc94b2389792c262de0f1bf4dc9d09622864bf10111cbbaa8723df

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

@@ -2,10 +2,16 @@ module Comee
   module Core
     class AdditionalItem < ApplicationRecord
       before_save { self.total_price = unit_price * quantity }
+      after_save { invoice.update_total_price }
       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)
+        invoice.save!
+      end
     end
   end
 end

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

@@ -20,6 +20,11 @@ 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!
+      end
+
       def self.ransackable_attributes(_auth_object = nil)
         %w[
           id

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

@@ -2,7 +2,7 @@ module Comee
   module Core
     class InvoiceItem < ApplicationRecord
       before_save { self.total_price = unit_price * quantity }
-      after_save :update_invoice_price
+      after_save { invoice.update_total_price }
 
       belongs_to :shipment_instruction_item
       belongs_to :invoice
@@ -11,10 +11,10 @@ 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.save!
-      end
+      # def update_invoice_price
+      #   invoice.total_price = invoice.invoice_items.sum(:total_price) + invoice.additional_items.sum(:total_price)
+      #   invoice.save!
+      # end
     end
   end
 end

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

@@ -12,7 +12,7 @@ module Comee
       end
 
       def self.ransackable_associations(_auth_object = nil)
-        %w[payment_deposit invoice]
+        %w[payment_order supplier_invoice]
       end
 
       def validate_amount

data/lib/comee/core/version.rb

@@ -1,5 +1,5 @@
 module Comee
   module Core
-    VERSION = "0.2.47".freeze
+    VERSION = "0.2.49".freeze
   end
 end

metadata

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