smerp-quotation-engine 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe098615d1e76739d450befbe4674338e82ed8af23e12d978b65d0366b343c08
-  data.tar.gz: 16b4fe60c3dac241446f83947d31cd6628f3b2025b17c646fc88699de32c6287
+  metadata.gz: 293054db3d6713f61e254c15a54ec202288e03643f86b7818393d8addf60d03a
+  data.tar.gz: 876e16fef179ffe760eb9ae63cf6009470dfd73220a0fa1fd7c5a7e46928fd8d
 SHA512:
-  metadata.gz: 3e903694f6e4edb0f0bf7920926fa7d927ea71a3cad4ae5132836d0050e8e958d64200abadba146c9012e6aae2c2288ac5f3afb71c83dd4ff8e8cbb92083ada1
-  data.tar.gz: e56d521bfa05b37f3e3da10a0d060f3d86c4cc254b77255e6be20932e1fa9c4756961ace7cb427ecba3e646b8e4e7540d05a8b55ab792b9adb81b632e87ce357
+  metadata.gz: e3e7f583435ca89f9725967990e89e63601561060d346c665b92820c0d290a681c3e255ff7c6e398dfe61d50f3b0a3c0a5a2440080984a58e74fc5e78e214884
+  data.tar.gz: 40a5d757d215c41cdf211be0d2695cfc9231dbb41ac47a36ee2c2dcef28fa6748d440fa56af888910f74367442e4f2d3f6cb9fdcf97de2da8890af087b2ab4ca

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

@@ -206,7 +206,8 @@ module Smerp::Quotation::Engine
     end
 
     def download_excel
-      
+     
+      p @quotation
       exp = Smerp::Exporter::Excel::Exporter.instance 
       exp.start_cell(8,0)
 
@@ -228,6 +229,9 @@ module Smerp::Quotation::Engine
         seq = 1
         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
+
           patch = "   " * level
           name = [""]
           name << patch
@@ -265,6 +269,13 @@ module Smerp::Quotation::Engine
     def recurse_items(item, sheet, level)
       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
+
         patch = "   " * level
         name = [""]
         name << patch
@@ -280,7 +291,7 @@ module Smerp::Quotation::Engine
     private
       # Use callbacks to share common setup or constraints between actions.
       def set_quotation
-        @quotation = Quotation.find(params[:id])
+        @quotation = Smerp::Quotation::Engine::Quotation.find(params[:id])
       end
 
       # Only allow a list of trusted parameters through.

data/app/models/smerp/quotation/engine/quotation.rb

@@ -7,7 +7,7 @@ module Smerp::Quotation::Engine
 
     validates_presence_of :name
 
-    has_many :quotation_items
+    has_many :quotation_items, class_name: "Smerp::Quotation::Engine::QuotationItem"
 
     def quotation_items_allocated_resources
 

data/app/models/smerp/quotation/engine/quotation_item.rb

@@ -8,6 +8,8 @@ module Smerp::Quotation::Engine
 
     acts_as_list
 
+    acts_as_tree
+
     attr_accessor :sel_qi, :quantum
 
     belongs_to :quotation_product, optional: true
@@ -16,7 +18,7 @@ module Smerp::Quotation::Engine
 
     before_validation :map_product_item
 
-    belongs_to :quotation
+    belongs_to :quotation, class_name: "Smerp::Quotation::Engine::Quotation"
 
     def map_product_item
 

data/app/models/smerp/quotation/engine/quotation_product.rb

@@ -21,7 +21,7 @@ module Smerp::Quotation::Engine
 
     belongs_to :quotation_product_category
 
-    has_many :quotation_items
+    has_many :quotation_items, class_name: "Smerp::Quotation::Engine::QuotationItem"
 
     def QuotationProduct.active_products(cat = nil)
       if cat.nil?

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

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

metadata

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