smerp-quotation 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e42c00897ec17d8b63b419e3ed0ac415c067474de1dbf1e9c058a20ff2b79d5
-  data.tar.gz: eae98863ae3ca0604e35181283df1a38977f55b1d80428fd5a9ed61974c9b19a
+  metadata.gz: 0a18dda7b56228271c1032e1a27ef4c0a1dabfa1ed8d44c219ba4b88a9ae4d5a
+  data.tar.gz: bd4083071f2cdf271a4eab01422282ad51fc5a55959e40f65514ba8af06e6c2d
 SHA512:
-  metadata.gz: 92f27ab04cb522e2aa3c61e76d1aa231245e40c54969de1e23a57b2d6ede741f5b330fabdd88bbf1ed926164d5ab60e16d95f14304ce94a75e049028d81583a2
-  data.tar.gz: ac6611999cf8a7c8ec1b0e22f192083ebdfa800fdbd999b49f5bdb18909f453ecc3610ec6a3cf2c7632c74e56cdcd899750dbd396523da2e09c984e42261a2cd
+  metadata.gz: f52d9a81d3f337e75eb8abcb9087adc0faf6850b743ffe8378578dcaaa8550f118ae6085992dfb3631cb8c071971a7b9fefe97615787be4092ac7bd24fe6fb3d
+  data.tar.gz: cb3e06001da8068f511261852688f6c19aa2b3716b1db7ca6e99c1420f101e9134faf9014b060939127fbb5fd2dfde7975fdeb86070197a6e39950bb9b45d321

data/.release_history.yml

@@ -8,3 +8,5 @@ smerp-quotation:
   :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.3)
+    smerp-quotation (0.2.4)
       acts_as_list
       acts_as_tree
       ca-data_store

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

@@ -73,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}"
@@ -184,6 +184,8 @@ module Smerp
 
             if not pa.nil?
 
+              #pa.reload
+
               if pa.is_children_linked?
 
                 teLogger.debug "Parent #{pa.inspect} IS children linked" 
@@ -196,13 +198,17 @@ module Smerp
                   # 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)
@@ -222,8 +228,16 @@ module Smerp
                   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
@@ -232,7 +246,7 @@ module Smerp
           end
 
           # calculate if I'm the source to be embedded into other items
-          recalculate_total_to_destination_quotation_items
+          recalculate_total_to_destination_quotation_items if self.is_consolidation_source_item?
 
           #self.quotation.update_total_from_children
 

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.3"
+    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.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ian