smerp-quotation 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b31b97876363a1e89cf5bfd87e092f304d3a0d873d222a28ac9669473ed53c9
-  data.tar.gz: 758df4aba6b9319126334fd2d8b7af834bd1f582ef77c5bb14ab8180008c5c09
+  metadata.gz: 8c8ccbdb5928d32132abbd47b040135e7b119765e37357aca2a5decb984d53b9
+  data.tar.gz: '0977180c69458fd15b22787c3a7f169fdf8b2002d0ad636571ba1257b99ec40c'
 SHA512:
-  metadata.gz: 0a465d9ce3167cb1d782f9fbdf8d277be35fe554238da074c431b2235c7a446522ccec29d4a4afe3d8555c0a22999ad7282e5aefcc969ab7e1900ddb684af6ab
-  data.tar.gz: c4b6557dc0e7fe67c3daa382d0a147e968f5b4dab7e5a3a8a9fbaa53dff2bb5e6aeed47a74d5ee15a2db181a8861e4637b64983937a1811f7074135d805bccd4
+  metadata.gz: cf286bbbcb7ef09a08acb48ae2f4749e4f2079a5f4866e14116a026e96126383ef96422e9bf14a124e4050def1ca9e6c05aa6c0c619b82a85028a7485e00d7a0
+  data.tar.gz: cff193ff53153f5c892194668afda4bd4c4568a9dc5a187db801a6264d43bf01b4ca4adf690eef6b9a279f9d37962d28a5b65577ac3715a7e026f82512b32f35

data/.release_history.yml

@@ -2,3 +2,7 @@
 smerp-quotation:
 - :version: 0.1.0
   :timestamp: 1664514502.3722005
+- :version: 0.2.0
+  :timestamp: 1664783292.2046304
+- :version: 0.2.1
+  :timestamp: 1664817326.603613

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smerp-quotation (0.2.0)
+    smerp-quotation (0.2.2)
       acts_as_list
       acts_as_tree
       ca-data_store
@@ -148,7 +148,7 @@ GEM
     tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     wisper (2.0.1)
-    zeitwerk (2.6.0)
+    zeitwerk (2.6.1)
 
 PLATFORMS
   x86_64-linux

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

@@ -36,8 +36,10 @@ module Smerp
         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
+        #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
 
@@ -158,9 +160,92 @@ module Smerp
 
         end
 
+        # Only for destroy operation
+        def destroy_hook
+          
+          parent = self.parent.clone
+          qi_dist = self.quotation_item_distributions
+          quotation = self.quotation
+
+          # record deleteion here
+          yield
+
+          if not parent.nil?
+
+            if parent.is_children_linked?
+
+              teLogger.debug "Parent #{parent.inspect} IS children linked" 
+              # 
+              # Children of another QuotationItem
+              #
+              if parent.quantity > 0
+                # for children item that has a parent
+                # update parent 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
+                parent.unit_price = parent.consolidated_line_total / parent.quantity
+
+                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
+
+                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
+
+              parent.save
+
+            else
+              teLogger.debug "Parent #{parent.inspect} is NOT children linked. Skipping children update to parent." 
+            end
+
+          end # if parent exist
+
+          # remove the distributed figure from other record if this record is the source item
+          qi_dist.each do |qid|
+           
+            citm = qid.distributed_quotation_item
+
+            next if citm.nil?
+
+            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
+
         def update_quotation_total
 
-          if not self.parent.nil? 
+          if not self.parent.nil?
 
             self.parent.reload
 
@@ -173,6 +258,7 @@ module Smerp
               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)
 
                 # update unit_price since line_total is sum of children's line_total
@@ -207,7 +293,9 @@ module Smerp
           # 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(:consolidated_line_total)
+          #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)
@@ -217,6 +305,52 @@ module Smerp
 
         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
           
@@ -224,7 +358,7 @@ module Smerp
             self.line_total = self.quantity * self.unit_price
             # reset consolidated total and calculate again
             self.consolidated_line_total = self.line_total
-            calculate_incoming_distribution
+            recalculate_total_from_source_quotation_items
           end
 
           if self.discount_changed?
@@ -233,6 +367,16 @@ module Smerp
 
         end
 
+        def is_consolidation_destination_item?
+          self.source_quotation_items_link.reload
+          self.source_quotation_items_link.count > 0
+        end
+
+        def is_consolidation_source_item?
+          self.quotation_item_distributions.reload
+          self.quotation_item_distributions.count > 0
+        end
+
         # recalculate becauase destionation line_total changed
         # triggered before_save
         def recalculate_total_from_source_quotation_items
@@ -251,7 +395,11 @@ module Smerp
 
             teLogger.debug "Distribution calculation : #{cal.result}"
 
-            ttl += cal.result[Smerp::Quotation::DistributionCalculator::DistributedAmount]
+            distAmt = cal.result[Smerp::Quotation::DistributionCalculator::DistributedAmount]
+
+            ttl += distAmt
+
+            srcItm.consolidated_line_total -= distAmt
 
             iqi.distribution_calculations = YAML.dump(cal.for_storage)
             iqi.save
@@ -259,6 +407,10 @@ module Smerp
           end
 
           self.consolidated_line_total = ttl
+          # if there is discount calculator defined
+          # this value shall be reset
+          # If there is none, this value should be same as consolidated_line_total
+          self.line_total_after_discount = ttl
           
         end
 
@@ -301,36 +453,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
@@ -546,10 +668,10 @@ module Smerp
 
 
         def distribute_to(distTo, val)
-       
+      
           dist = QuotationItemDistribution.new
           dist.quotation_item = self
-          dist.distributed_quotation_item_id = distTo.quotation_item.id
+          dist.distributed_quotation_item = distTo
           cal = Smerp::Quotation::DistributionCalculator.new(val)
           cal.input_field = :consolidated_line_total
           dist.distribution_calculations = YAML.dump(cal.for_storage)

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.0"
+    VERSION = "0.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smerp-quotation
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 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