smerp-quotation 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2cb34cdeb9ad8ef119a801316aa9d874cbd0565f8ad246e91a5311fcae2a8af
-  data.tar.gz: 944120a5dca8e07e6b1b3f9dcf7724e32c5ca586ffe18fc84bb6a394bf59c4ed
+  metadata.gz: 3e42c00897ec17d8b63b419e3ed0ac415c067474de1dbf1e9c058a20ff2b79d5
+  data.tar.gz: eae98863ae3ca0604e35181283df1a38977f55b1d80428fd5a9ed61974c9b19a
 SHA512:
-  metadata.gz: c9b447f31c94f7fe6ec928556f2e92a85af3569eebc459a0b5efee5041ecab2c70ba8a1c34bc8be9b832839698b0840e1d83bd3f5e0e39ec81ec1236b2cef9fe
-  data.tar.gz: 1f08fe39a26bd4f74a6598ff4a2d699acd3eee5d431e9e4b9923f418a766cf57516e9378f9f062f1a88d319ca8e9f743695392092845d1417bbfa6286115c450
+  metadata.gz: 92f27ab04cb522e2aa3c61e76d1aa231245e40c54969de1e23a57b2d6ede741f5b330fabdd88bbf1ed926164d5ab60e16d95f14304ce94a75e049028d81583a2
+  data.tar.gz: ac6611999cf8a7c8ec1b0e22f192083ebdfa800fdbd999b49f5bdb18909f453ecc3610ec6a3cf2c7632c74e56cdcd899750dbd396523da2e09c984e42261a2cd

data/.release_history.yml

@@ -4,3 +4,7 @@ smerp-quotation:
   :timestamp: 1664514502.3722005
 - :version: 0.2.0
   :timestamp: 1664783292.2046304
+- :version: 0.2.1
+  :timestamp: 1664817326.603613
+- :version: 0.2.2
+  :timestamp: 1664874428.3551033

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smerp-quotation (0.2.1)
+    smerp-quotation (0.2.3)
       acts_as_list
       acts_as_tree
       ca-data_store

data/lib/smerp/quotation/ar_model/quotation.rb

@@ -100,9 +100,10 @@ module Smerp
         end
 
         def recalculate
-          # call by calculator after processing
+          # call by calculator after rounding
         end
 
+
       end # class Quotation
     end
 

data/lib/smerp/quotation/ar_model/quotation_item.rb

@@ -33,13 +33,17 @@ module Smerp
 
         belongs_to :quotation_item_group, optional: true
 
-        before_save :update_total
-        after_save :update_group_total, :update_quotation_total 
+        #before_save :update_total
+        #after_save :update_group_total, :update_quotation_total 
 
-        before_destroy :update_total
-        after_destroy :update_group_total, :update_quotation_total, :remove_total_from_destination_quotation_items
+        around_save :update_related_around_save
 
-        def update_total
+        #before_destroy :update_total, :update_group_total, :update_quotation_total, :remove_total_from_destination_quotation_items
+        #after_destroy :update_group_total, :update_quotation_total, :remove_total_from_destination_quotation_items
+        #after_destroy :update_quotation_total, :remove_total_from_destination_quotation_items
+        around_destroy :destroy_hook
+
+        def update_related_around_save
 
           if self.children.length == 0
             self.line_total = self.quantity * self.unit_price  if self.quantity_changed? or self.unit_price_changed? 
@@ -142,9 +146,213 @@ module Smerp
           self.extended_calculators = YAML.dump(res)
           ## Calculator execution completed
 
-          teLogger.debug "before save done : #{self.inspect}"
+          # cater parent changed
+          oldParent = nil
+          if self.parent_id_changed? and not self.parent_id_was.nil?
+            oldParent = QuotationItem.find(self.parent_id_was)
+          end
+
+          # cater group changed
+          oldGroup = nil
+          if self.quotation_item_group_id_changed? and not self.quotation_item_group_id_was.nil?
+            oldGroup = QuotationItemGroup.find(self.quotation_item_group_id)
+          end
+
+          ###
+          # SAVE HAPPENED HERE
+          ###
+          yield
+
+
+          # 
+          # AFTER SAVE
+          #
+          grp = self.quotation_item_group
+          [grp, oldGroup].each do |g|
+
+            if not g.nil?
+              # update total
+              g.group_total = g.children.sum(:group_total) + g.quotation_items.sum(:line_total)
+              g.group_discount = g.children.sum(:group_discount) + g.quotation_items.sum(:discount)
+              g.group_tax = g.children.sum(:group_tax) + g.quotation_items.sum(:tax)
+              g.save
+            end
+          end
+          
+
+          [self.parent, oldParent].each do |pa|
+
+            if not pa.nil?
+
+              if pa.is_children_linked?
+
+                teLogger.debug "Parent #{pa.inspect} IS children linked" 
+                # 
+                # Children of another QuotationItem
+                #
+                if pa.quantity > 0
+
+                  # this parent children has changed because self
+                  # has changed its parent to other parent
+                  pa.children.reload
+
+                  # for children item that has a parent
+                  # update parent line_total
+                  pa.line_total = pa.children.sum(:line_total)
+                  pa.consolidated_line_total = pa.children.sum(:consolidated_line_total)
+
+                  # update unit_price since line_total is sum of children's line_total
+                  pa.unit_price = pa.consolidated_line_total / pa.quantity
+
+                  pa.discount = pa.children.sum(:discount)
+                  pa.line_total_after_discount = pa.children.sum(:line_total_after_discount)
+                  pa.tax = pa.children.sum(:tax)
+                  pa.line_total_with_tax = pa.children.sum(:line_total_with_tax)
+
+                  #teLogger.debug "After update from children : #{self.parent.inspect}"
+
+                else
+
+                  pa.line_total = 0.0
+                  pa.consolidated_line_total = 0.0
+                  pa.unit_price = 0.0
+                  pa.discount = 0.0
+                  pa.line_total_after_discount = 0.0
+                  pa.tax = 0.0
+                  pa.line_total_with_tax = 0.0
+                end
+
+                pa.save
+
+              else
+                teLogger.debug "Parent #{pa.inspect} is NOT children linked. Skipping children update to parent." 
+              end
+
+            end # if parent exist
+          end
+
+          # calculate if I'm the source to be embedded into other items
+          recalculate_total_to_destination_quotation_items
+
+          #self.quotation.update_total_from_children
+
+          self.quotation.total = self.quotation.quotation_items.where(["parent_id is null"]).sum(:line_total)
+          self.quotation.total_discount = self.quotation.quotation_items.where(["parent_id is null"]).sum(:discount)
+          self.quotation.total_after_discount = self.quotation.quotation_items.where(["parent_id is null"]).sum(:line_total_after_discount)
+          self.quotation.total_tax = self.quotation.quotation_items.where(["parent_id is null"]).sum(:tax)
+          self.quotation.total_with_tax = self.quotation.quotation_items.where(["parent_id is null"]).sum(:line_total_with_tax)
+
+          self.quotation.save
+
         end
 
+        #def update_total
+
+        #  if self.children.length == 0
+        #    self.line_total = self.quantity * self.unit_price  if self.quantity_changed? or self.unit_price_changed? 
+        #    self.line_total_after_discount = self.line_total 
+        #    self.line_total_with_tax = self.line_total
+
+        #    #teLogger.debug "sync consolidated #{self.inspect} to line_total #{self.line_total.to_i}"
+        #    self.consolidated_line_total = self.line_total if self.new_record?
+        #    #teLogger.debug "sync consolidated #{self.inspect} to line_total #{self.line_total.to_i}"
+
+        #  else
+        #    #teLogger.debug "#{self.inspect} has children : #{self.children}"
+        #  end
+
+        #  if self.quantity_changed?
+        #    teLogger.debug "Quantity changed"
+        #    # Change unit_price for record that has children
+        #    # since unit_price is 'derived' from children's line_total
+        #    if self.quantity > 0
+        #      self.unit_price = self.line_total / self.quantity
+        #    else
+        #      self.unit_price = 0.0
+        #      self.line_total = 0.0
+        #    end
+        #  end
+
+        #  #teLogger.debug "Before recalculate : #{self.inspect}"
+        #  ## Calculate consolidated line total
+        #  # Calculate line total of each item that push to this parent item
+        #  if not self.new_record?
+        #    recalculate_total_from_source_quotation_items
+        #  end
+        #  #teLogger.debug "After recalculate : #{self.inspect}"
+
+        #  # 
+        #  # Start trigger defined calculators
+        #  #
+        #  res = { local: [], quotation: [] }
+        #  extCals = { local: [], quotation: [] }
+        #  if not_empty?(self.extended_calculators)
+        #    extCals = YAML.load(self.extended_calculators)
+        #  end
+
+        #  extCals[:local].each do |ec|
+        #    teLogger.debug "Executing item calculator : #{ec.inspect}"
+        #    ec.calculate(self)
+        #    ec.owner_id = self.id if is_empty?(ec.owner_id) and not self.new_record?
+        #    res[:local] << ec.for_storage
+        #  end
+
+        #  if self.new_record?
+        #    
+        #    # apply global calculator from quotation
+        #    gExtCals = []
+        #    if not_empty?(self.quotation.extended_calculators)
+        #      gExtCals = YAML.load(self.quotation.extended_calculators) 
+        #    end
+
+        #    #cals = []
+        #    gExtCals.each do |ec|
+
+        #      teLogger.debug "Executing item-quotation calculator : #{ec.inspect}"
+        #      ec.calculate(self)
+        #      ec.owner_id = self.quotation.id if is_empty?(ec.owner_id)
+        #      res[:quotation] << ec.for_storage
+
+        #    end
+
+        #  else
+
+        #    extCals[:quotation].each do |ec|
+        #      teLogger.debug "Executing item-quotation calculator : #{ec.inspect}"
+        #      ec.calculate(self)
+        #      ec.owner_id = self.quotation.id if is_empty?(ec.owner_id)
+        #      res[:quotation] << ec.for_storage
+        #    end
+        #    
+        #  end
+
+
+        #  # after calculate, remove item with zero params
+        #  res[:local].delete_if { |c| 
+        #    case c.params
+        #    when Smerp::Common::FinUtils::Percent
+        #      c.params.value == 0
+        #    else
+        #      c.params.to_i == 0
+        #    end
+        #  }
+
+        #  res[:quotation].delete_if { |c| 
+        #    case c.params
+        #    when Smerp::Common::FinUtils::Percent
+        #      c.params.value == 0
+        #    else
+        #      c.params.to_i == 0
+        #    end
+        #  }
+
+        #  self.extended_calculators = YAML.dump(res)
+        #  ## Calculator execution completed
+
+        #  teLogger.debug "before save done : #{self.inspect}"
+
+        #end
+
         def update_group_total
 
           grp = self.quotation_item_group
@@ -158,66 +366,203 @@ module Smerp
 
         end
 
-        def update_quotation_total
+        # Only for destroy operation
+        def destroy_hook
+          
+          parent = self.parent.clone
+          qi_dist = self.quotation_item_distributions
+          quotation = self.quotation
 
-          if not self.parent.nil? 
+          # record deleteion here
+          yield
 
-            self.parent.reload
+          if not parent.nil?
 
-            if self.parent.is_children_linked?
+            if parent.is_children_linked?
 
-              teLogger.debug "Parent #{self.parent.inspect} IS children linked" 
+              teLogger.debug "Parent #{parent.inspect} IS children linked" 
               # 
               # Children of another QuotationItem
               #
-              if self.parent.quantity > 0
+              if parent.quantity > 0
                 # for children item that has a parent
                 # update parent line_total
-                self.parent.line_total = self.parent.children.sum(:line_total)
-                self.parent.consolidated_line_total = self.parent.children.sum(:consolidated_line_total)
+                parent.line_total = parent.children.sum(:line_total)
+                parent.consolidated_line_total = parent.children.sum(:consolidated_line_total)
 
                 # update unit_price since line_total is sum of children's line_total
-                self.parent.unit_price = self.parent.consolidated_line_total / self.parent.quantity
+                parent.unit_price = parent.consolidated_line_total / parent.quantity
 
-                self.parent.discount = self.parent.children.sum(:discount)
-                self.parent.line_total_after_discount = self.parent.children.sum(:line_total_after_discount)
-                self.parent.tax = self.parent.children.sum(:tax)
-                self.parent.line_total_with_tax = self.parent.children.sum(:line_total_with_tax)
+                parent.discount = parent.children.sum(:discount)
+                parent.line_total_after_discount = parent.children.sum(:line_total_after_discount)
+                parent.tax = parent.children.sum(:tax)
+                parent.line_total_with_tax = parent.children.sum(:line_total_with_tax)
 
                 #teLogger.debug "After update from children : #{self.parent.inspect}"
 
               else
 
-                self.parent.line_total = 0.0
-                self.parent.consolidated_line_total = 0.0
-                self.parent.unit_price = 0.0
-                self.parent.discount = 0.0
-                self.parent.line_total_after_discount = 0.0
-                self.parent.tax = 0.0
-                self.parent.line_total_with_tax = 0.0
+                parent.line_total = 0.0
+                parent.consolidated_line_total = 0.0
+                parent.unit_price = 0.0
+                parent.discount = 0.0
+                parent.line_total_after_discount = 0.0
+                parent.tax = 0.0
+                parent.line_total_with_tax = 0.0
               end
 
-              self.parent.save
+              parent.save
 
             else
-              teLogger.debug "Parent #{self.parent.inspect} is NOT children linked. Skipping children update to parent." 
+              teLogger.debug "Parent #{parent.inspect} is NOT children linked. Skipping children update to parent." 
             end
 
           end # if parent exist
 
-          # calculate if I'm the source to be embedded into other items
-          recalculate_total_to_destination_quotation_items
+          # remove the distributed figure from other record if this record is the source item
+          qi_dist.each do |qid|
+           
+            citm = qid.distributed_quotation_item
 
-          self.quotation.total = self.quotation.quotation_items.where(["parent_id is null"]).sum(:line_total)
-          self.quotation.total_discount = self.quotation.quotation_items.where(["parent_id is null"]).sum(:discount)
-          self.quotation.total_after_discount = self.quotation.quotation_items.where(["parent_id is null"]).sum(:line_total_after_discount)
-          self.quotation.total_tax = self.quotation.quotation_items.where(["parent_id is null"]).sum(:tax)
-          self.quotation.total_with_tax = self.quotation.quotation_items.where(["parent_id is null"]).sum(:line_total_with_tax)
+            next if citm.nil?
 
-          self.quotation.save
+            cal = YAML.load(qid.distribution_calculations)
+            extRes = cal.result.clone
+
+            citm.consolidated_line_total = (citm.consolidated_line_total - extRes[Smerp::Quotation::DistributionCalculator::DistributedAmount])
+
+            qid.destroy
+
+            citm.source_quotation_items_link.reload
+
+            citm.save
+
+          end
+
+          quotation.total = quotation.quotation_items.where(["parent_id is null"]).sum(:line_total)
+          quotation.total_discount = quotation.quotation_items.where(["parent_id is null"]).sum(:discount)
+          quotation.total_after_discount = quotation.quotation_items.where(["parent_id is null"]).sum(:line_total_after_discount)
+          quotation.total_tax = quotation.quotation_items.where(["parent_id is null"]).sum(:tax)
+          quotation.total_with_tax = quotation.quotation_items.where(["parent_id is null"]).sum(:line_total_with_tax)
+
+          quotation.save
 
         end
 
+        # trigger after save
+        #def update_quotation_total
+
+        #  if not self.parent.nil?
+
+        #    self.parent.reload
+
+        #    if self.parent.is_children_linked?
+
+        #      teLogger.debug "Parent #{self.parent.inspect} IS children linked" 
+        #      # 
+        #      # Children of another QuotationItem
+        #      #
+        #      if self.parent.quantity > 0
+        #        
+        #        # this parent children has changed because self
+        #        # has changed its parent to other parent
+        #        self.parent.children.reload
+
+        #        # for children item that has a parent
+        #        # update parent line_total
+        #        self.parent.line_total = self.parent.children.sum(:line_total)
+        #        self.parent.consolidated_line_total = self.parent.children.sum(:consolidated_line_total)
+
+        #        # update unit_price since line_total is sum of children's line_total
+        #        self.parent.unit_price = self.parent.consolidated_line_total / self.parent.quantity
+
+        #        self.parent.discount = self.parent.children.sum(:discount)
+        #        self.parent.line_total_after_discount = self.parent.children.sum(:line_total_after_discount)
+        #        self.parent.tax = self.parent.children.sum(:tax)
+        #        self.parent.line_total_with_tax = self.parent.children.sum(:line_total_with_tax)
+
+        #        #teLogger.debug "After update from children : #{self.parent.inspect}"
+
+        #      else
+
+        #        self.parent.line_total = 0.0
+        #        self.parent.consolidated_line_total = 0.0
+        #        self.parent.unit_price = 0.0
+        #        self.parent.discount = 0.0
+        #        self.parent.line_total_after_discount = 0.0
+        #        self.parent.tax = 0.0
+        #        self.parent.line_total_with_tax = 0.0
+        #      end
+
+        #      self.parent.save
+
+        #    else
+        #      teLogger.debug "Parent #{self.parent.inspect} is NOT children linked. Skipping children update to parent." 
+        #    end
+
+        #  end # if parent exist
+
+        #  # calculate if I'm the source to be embedded into other items
+        #  recalculate_total_to_destination_quotation_items
+
+        #  #self.quotation.update_total_from_children
+
+        #  self.quotation.total = self.quotation.quotation_items.where(["parent_id is null"]).sum(:line_total)
+        #  self.quotation.total_discount = self.quotation.quotation_items.where(["parent_id is null"]).sum(:discount)
+        #  self.quotation.total_after_discount = self.quotation.quotation_items.where(["parent_id is null"]).sum(:line_total_after_discount)
+        #  self.quotation.total_tax = self.quotation.quotation_items.where(["parent_id is null"]).sum(:tax)
+        #  self.quotation.total_with_tax = self.quotation.quotation_items.where(["parent_id is null"]).sum(:line_total_with_tax)
+
+        #  self.quotation.save
+
+        #end
+
+        # this called after child is destroy
+        #def update_self_as_parent
+
+        #  self.reload
+
+        #  if self.is_children_linked?
+
+        #    teLogger.debug "Parent #{self.inspect} IS children linked" 
+        #    # 
+        #    # Children of another QuotationItem
+        #    #
+        #    if self.quantity > 0
+        #      # for children item that has a parent
+        #      # update parent line_total
+        #      self.line_total = self.children.sum(:line_total)
+        #      self.consolidated_line_total = self.children.sum(:consolidated_line_total)
+
+        #      # update unit_price since line_total is sum of children's line_total
+        #      self.unit_price = self.consolidated_line_total / self.quantity
+
+        #      self.discount = self.children.sum(:discount)
+        #      self.line_total_after_discount = self.children.sum(:line_total_after_discount)
+        #      self.tax = self.children.sum(:tax)
+        #      self.line_total_with_tax = self.children.sum(:line_total_with_tax)
+
+        #      #teLogger.debug "After update from children : #{self.parent.inspect}"
+
+        #    else
+
+        #      self.line_total = 0.0
+        #      self.consolidated_line_total = 0.0
+        #      self.unit_price = 0.0
+        #      self.discount = 0.0
+        #      self.line_total_after_discount = 0.0
+        #      self.tax = 0.0
+        #      self.line_total_with_tax = 0.0
+        #    end
+
+        #    self.save
+
+        #  else
+        #    teLogger.debug "Parent #{self.inspect} is NOT children linked. Skipping children update to parent." 
+        #  end
+
+        #end
+
 
         def recalculate
           
@@ -320,36 +665,6 @@ module Smerp
 
         end
 
-        # item that is being distributed to other
-        # quotation items is being destroyed
-        # Remove those portion from each and every items
-        def remove_total_from_destination_quotation_items
-
-          self.quotation_item_distributions.each do |qid|
-           
-            citm = qid.distributed_quotation_item
-
-            next if citm.nil?
-
-            cal = YAML.load(qid.distribution_calculations)
-            extRes = cal.result.clone
-
-            #teLogger.debug "before citm #{citm.inspect} / #{citm.consolidated_line_total}"
-            citm.consolidated_line_total = (citm.consolidated_line_total - extRes[Smerp::Quotation::DistributionCalculator::DistributedAmount])
-            #teLogger.debug "after deduction citm #{citm.inspect} / #{citm.consolidated_line_total}"
-
-            #teLogger.debug "qid : #{qid.inspect}"
-            qid.destroy
-
-            citm.source_quotation_items_link.reload
-
-            citm.save
-            #teLogger.debug "after citm #{citm.inspect} / #{citm.consolidated_line_total}"
-
-          end
-          
-        end
-
         def total_distributed
          
           ttl = 0.0

data/lib/smerp/quotation/calculators/discount_calculator.rb

@@ -49,7 +49,7 @@ module Smerp
             end
 
             res[:output] = @output_field
-            mdl.recalculate
+            #mdl.recalculate
           end
 
           @result = res

data/lib/smerp/quotation/version.rb

@@ -2,6 +2,6 @@
 
 module Smerp
   module Quotation
-    VERSION = "0.2.1"
+    VERSION = "0.2.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smerp-quotation
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.3
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack