smerp-quotation 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b31b97876363a1e89cf5bfd87e092f304d3a0d873d222a28ac9669473ed53c9
-  data.tar.gz: 758df4aba6b9319126334fd2d8b7af834bd1f582ef77c5bb14ab8180008c5c09
+  metadata.gz: c2cb34cdeb9ad8ef119a801316aa9d874cbd0565f8ad246e91a5311fcae2a8af
+  data.tar.gz: 944120a5dca8e07e6b1b3f9dcf7724e32c5ca586ffe18fc84bb6a394bf59c4ed
 SHA512:
-  metadata.gz: 0a465d9ce3167cb1d782f9fbdf8d277be35fe554238da074c431b2235c7a446522ccec29d4a4afe3d8555c0a22999ad7282e5aefcc969ab7e1900ddb684af6ab
-  data.tar.gz: c4b6557dc0e7fe67c3daa382d0a147e968f5b4dab7e5a3a8a9fbaa53dff2bb5e6aeed47a74d5ee15a2db181a8861e4637b64983937a1811f7074135d805bccd4
+  metadata.gz: c9b447f31c94f7fe6ec928556f2e92a85af3569eebc459a0b5efee5041ecab2c70ba8a1c34bc8be9b832839698b0840e1d83bd3f5e0e39ec81ec1236b2cef9fe
+  data.tar.gz: 1f08fe39a26bd4f74a6598ff4a2d699acd3eee5d431e9e4b9923f418a766cf57516e9378f9f062f1a88d319ca8e9f743695392092845d1417bbfa6286115c450

data/.release_history.yml

@@ -2,3 +2,5 @@
 smerp-quotation:
 - :version: 0.1.0
   :timestamp: 1664514502.3722005
+- :version: 0.2.0
+  :timestamp: 1664783292.2046304

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    smerp-quotation (0.2.0)
+    smerp-quotation (0.2.1)
       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_item.rb

@@ -173,6 +173,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 +208,7 @@ 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.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)
@@ -224,7 +225,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 +234,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 +262,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 +274,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
 
@@ -546,10 +565,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/version.rb

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

metadata

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