smerp-quotation-engine 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 293054db3d6713f61e254c15a54ec202288e03643f86b7818393d8addf60d03a
-  data.tar.gz: 876e16fef179ffe760eb9ae63cf6009470dfd73220a0fa1fd7c5a7e46928fd8d
+  metadata.gz: 80dfd42e0ad764fdea3a674d7a943e5167a8de3069ecab8e9d393bdefde54263
+  data.tar.gz: 754807fcf94349de3274f308bc9103d025650675f422ec0170644c2987ed5292
 SHA512:
-  metadata.gz: e3e7f583435ca89f9725967990e89e63601561060d346c665b92820c0d290a681c3e255ff7c6e398dfe61d50f3b0a3c0a5a2440080984a58e74fc5e78e214884
-  data.tar.gz: 40a5d757d215c41cdf211be0d2695cfc9231dbb41ac47a36ee2c2dcef28fa6748d440fa56af888910f74367442e4f2d3f6cb9fdcf97de2da8890af087b2ab4ca
+  metadata.gz: 77624ae54dce3df21f39221c297e39d5d55de45e5bc50c312015c602168d25c7cfe5fd8090acb56b935f756ea7ff5a790f5210c94070139bfe7affa1b58cf0e3
+  data.tar.gz: 3498b282903c2d4025c80bdd7fca00ac86759531c220d08357cbd3380d5bbf35adb6978c4c572a4003ffcb15c754c1d2fa8e25376a19286e8c5aef20272bb69a

data/app/controllers/smerp/quotation/engine/quotations_controller.rb

@@ -230,7 +230,7 @@ module Smerp::Quotation::Engine
         level = 0
         @quotation.quotation_items.where(["parent_id is null"]).order(:position).each do |i|
 
-          next if not i.quotation_product_id.nil? and i.quotation_product.quotation_product_category_id == 1
+          next if not i.quotation_product.nil? and i.quotation_product.quotation_product_category_id == 1
 
           patch = "   " * level
           name = [""]
@@ -238,7 +238,11 @@ module Smerp::Quotation::Engine
           name << "#{helpers.level_seq_conv(level, seq)}. "
           name << i.name
 
-          s.insert_row [name.join, i.quantity, i.unit, i.unit_price, i.line_total]
+          if i.children.length > 0 and not i.children[0].quotation_product.nil? and i.children[0].quotation_product.quotation_product_category_id == 1
+            s.insert_row [name.join, i.quantity, i.unit, i.unit_price, i.line_total]
+          else
+            s.insert_row [name.join, "","","",""]
+          end
           s.col_style(4, currencyStyle)
           s.col_style(5, currencyStyle)
 
@@ -270,19 +274,21 @@ module Smerp::Quotation::Engine
       seq = 1
       item.children.each do |c|
 
-        p c.inspect
-        p c.quotation_product_id
-        p c.quotation_product.inspect
-
-        next if not c.quotation_product_id.nil? and c.quotation_product.quotation_product_category_id == 1
+        next if not c.quotation_product.nil? and c.quotation_product.quotation_product_category_id == 1
 
         patch = "   " * level
         name = [""]
         name << patch
         name << "#{helpers.level_seq_conv(level, seq)}. "
         name << c.name
+        
+        if c.children.length > 0 and not c.children[0].quotation_product.nil? and c.children[0].quotation_product.quotation_product_category_id == 1
+          sheet.insert_row [name.join, c.quantity, c.unit, c.unit_price, c.line_total]
+        else
+          sheet.insert_row [name.join,"","","",""]
+        end
 
-        sheet.insert_row [name.join, c.quantity, c.unit, c.unit_price, c.line_total]
+        #sheet.insert_row [name.join, c.quantity, c.unit, c.unit_price, c.line_total]
         recurse_items(c, sheet, level+1) if c.children.length > 0
         seq += 1
       end

data/lib/smerp/quotation/engine/version.rb

@@ -1,7 +1,7 @@
 module Smerp
   module Quotation
     module Engine
-      VERSION = "0.4.6"
+      VERSION = "0.4.7"
     end
   end
 end

metadata

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