smerp-quotation 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8c8ccbdb5928d32132abbd47b040135e7b119765e37357aca2a5decb984d53b9
-  data.tar.gz: '0977180c69458fd15b22787c3a7f169fdf8b2002d0ad636571ba1257b99ec40c'
+  metadata.gz: 0a18dda7b56228271c1032e1a27ef4c0a1dabfa1ed8d44c219ba4b88a9ae4d5a
+  data.tar.gz: bd4083071f2cdf271a4eab01422282ad51fc5a55959e40f65514ba8af06e6c2d
 SHA512:
-  metadata.gz: cf286bbbcb7ef09a08acb48ae2f4749e4f2079a5f4866e14116a026e96126383ef96422e9bf14a124e4050def1ca9e6c05aa6c0c619b82a85028a7485e00d7a0
-  data.tar.gz: cff193ff53153f5c892194668afda4bd4c4568a9dc5a187db801a6264d43bf01b4ca4adf690eef6b9a279f9d37962d28a5b65577ac3715a7e026f82512b32f35
+  metadata.gz: f52d9a81d3f337e75eb8abcb9087adc0faf6850b743ffe8378578dcaaa8550f118ae6085992dfb3631cb8c071971a7b9fefe97615787be4092ac7bd24fe6fb3d
+  data.tar.gz: cb3e06001da8068f511261852688f6c19aa2b3716b1db7ca6e99c1420f101e9134faf9014b060939127fbb5fd2dfde7975fdeb86070197a6e39950bb9b45d321

data/.release_history.yml

@@ -6,3 +6,7 @@ smerp-quotation:
   :timestamp: 1664783292.2046304
 - :version: 0.2.1
   :timestamp: 1664817326.603613
+- :version: 0.2.2
+  :timestamp: 1664874428.3551033
+- :version: 0.2.3
+  :timestamp: 1664880291.384937

data/Gemfile.lock

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

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

@@ -33,15 +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 
+
+        around_save :update_related_around_save
 
         #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_total
+        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? 
@@ -71,7 +73,7 @@ module Smerp
           #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?
+          if self.is_consolidation_destination_item? and not self.new_record?
             recalculate_total_from_source_quotation_items
           end
           #teLogger.debug "After recalculate : #{self.inspect}"
@@ -144,9 +146,227 @@ 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?
+
+              #pa.reload
+
+              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
+
+
+                  teLogger.debug "Before setting any price : #{pa.inspect}"
+                  # 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)
+
+                  teLogger.debug "Before resetting unit price : #{pa.inspect}"
+                  # update unit_price since line_total is sum of children's line_total
+                  pa.unit_price = pa.consolidated_line_total / pa.quantity
+                  teLogger.debug "After resetting unit price : #{pa.inspect}"
+
+                  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
+
+                teLogger.debug "Before save parent #{pa.changes}"
+                pa.save
+
+                #pobj = QuotationItem.find(pa.id)
+                #p pobj
+                #pa.changes.each do |k,v|
+                #  pobj.send("#{k}=", v[1])
+                #end
+                #pobj.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 if self.is_consolidation_source_item?
+
+          #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
@@ -243,113 +463,119 @@ module Smerp
 
         end
 
-        def update_quotation_total
+        # trigger after save
+        #def update_quotation_total
 
-          if not self.parent.nil?
+        #  if not self.parent.nil?
 
-            self.parent.reload
+        #    self.parent.reload
 
-            if self.parent.is_children_linked?
+        #    if self.parent.is_children_linked?
 
-              teLogger.debug "Parent #{self.parent.inspect} IS children linked" 
-              # 
-              # Children of another QuotationItem
-              #
-              if self.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)
+        #      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
 
-                # 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
+        #        # 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)
 
-                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)
+        #        # 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
 
-                #teLogger.debug "After update from children : #{self.parent.inspect}"
+        #        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)
 
-              else
+        #        #teLogger.debug "After update from children : #{self.parent.inspect}"
 
-                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
+        #      else
 
-              self.parent.save
+        #        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
 
-            else
-              teLogger.debug "Parent #{self.parent.inspect} is NOT children linked. Skipping children update to parent." 
-            end
+        #      self.parent.save
 
-          end # if parent exist
+        #    else
+        #      teLogger.debug "Parent #{self.parent.inspect} is NOT children linked. Skipping children update to parent." 
+        #    end
 
-          # calculate if I'm the source to be embedded into other items
-          recalculate_total_to_destination_quotation_items
+        #  end # if parent exist
 
-          #self.quotation.update_total_from_children
+        #  # calculate if I'm the source to be embedded into other items
+        #  recalculate_total_to_destination_quotation_items
 
-          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.update_total_from_children
 
-          self.quotation.save
+        #  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)
 
-        end
+        #  self.quotation.save
+
+        #end
 
         # this called after child is destroy
-        def update_self_as_parent
+        #def update_self_as_parent
 
-            self.reload
+        #  self.reload
 
-            if self.is_children_linked?
+        #  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)
+        #    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
+        #      # 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)
+        #      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}"
+        #      #teLogger.debug "After update from children : #{self.parent.inspect}"
 
-              else
+        #    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.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
+        #    self.save
 
-            else
-              teLogger.debug "Parent #{self.inspect} is NOT children linked. Skipping children update to parent." 
-            end
-          
-        end
+        #  else
+        #    teLogger.debug "Parent #{self.inspect} is NOT children linked. Skipping children update to parent." 
+        #  end
+
+        #end
 
 
         def recalculate

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

@@ -7,10 +7,40 @@ module Smerp
       class QuotationItemDistribution < Ca::DataStore::Ar::Model
         include TR::CondUtils
 
+        include TeLogger::TeLogHelper
+        teLogger_tag :qiDist
+
         belongs_to :quotation_item
         belongs_to :distributed_quotation_item, class_name: 'QuotationItem'
 
 
+        around_destroy :update_link_total
+
+        def update_link_total
+
+          src = self.quotation_item
+          dest = self.distributed_quotation_item
+          cal = YAML.load(self.distribution_calculations)
+
+          ##
+          # Deleted
+          ##
+          yield
+
+
+          teLogger.debug "Result : #{cal.result}"
+          distVal = cal.result[Smerp::Quotation::DistributionCalculator::DistributedAmount]
+
+          #teLogger.debug "Source : #{src.inspect}"
+          #src.consolidated_line_total += distVal
+          #src.save
+
+          teLogger.debug "Dest : #{dest.inspect}"
+          dest.consolidated_line_total -= distVal
+          dest.save
+          
+        end
+
         #after_save :distribute
 
         #def distribute

data/lib/smerp/quotation/version.rb

@@ -2,6 +2,6 @@
 
 module Smerp
   module Quotation
-    VERSION = "0.2.2"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smerp-quotation
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Ian