qbwc_requests 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a85d85144d700242a1d770a5de43c65863598ed8
-  data.tar.gz: 46f6a9ad3ac465b5d3943c2c6e795961eea92c47
+  metadata.gz: e88c97b71f00f4fc7e25e65458002fccd428d550
+  data.tar.gz: 734e8c2ed6526d7f9a32930f96da52781e06cd95
 SHA512:
-  metadata.gz: 6444f54447929e095d1fadc760a959cc694701171c62913e738d5d81ae0b37ed00a4b1125078e78fd48d4e48a11d616f45da881b72c7e6cee46ab671c5fdaef6
-  data.tar.gz: c0d0aa5a0e33eb43420a64d67d40894252e41cb9624aacf7f77f67d29f226754027bf69e14bb94e4586a208a0a82037d29f93a987e416027f4f738a0356685c3
+  metadata.gz: c8359254fee1954a0ae76af02ef285627e90ea3271dcce41b6eb09ee4e1b320f461005bd3662268af9a2f7b62c10e7518009db772cc60de6eee55f113a68dd77
+  data.tar.gz: a354d377a62a896b2bab58eba1d6d5e94c3dd31cb5f9815d43cff2cf2e1077035bd759dc8fb1ed924c576f9d8a55854ba34380977f1fdfe66d199094c8c55930

data/lib/qbwc_requests/estimate/v07/add.rb

@@ -2,35 +2,13 @@ module QbwcRequests
   module Estimate
     module V07
       class Add < QbwcRequests::Base
-        field   :def_macro
-        ref_to  :customer, 209
-        ref_to  :class, 159
-        ref_to  :template, 31
-        field   :txn_date
-        field   :ref_number
-        field   :bill_address
-        field   :ship_address
-        field   :is_active
-        field   :po_number
-        ref_to  :terms, 31
-        field   :due_date
-        ref_to  :sales_rep, 5
-        field   :fob
-        ref_to  :item_sales_tax, 31
-        field   :memo
-        ref_to  :customer_msg, 101
-        field   :is_to_be_emailed
-        ref_to  :customer_sales_tax_code, 3
-        field   :other
-        field   :estimate_line_add
-        field   :estimate_line_group_add
+
+        ref_to :customer, 209
+        field :estimate_line_add
 
         validates :customer_ref, presence: true
-        validates :ref_number, length: { maximum: 11 }
-        validates :po_number, length: { maximum: 25 }
-        validates :fob, length: { maximum: 13 }
-        validates :memo, length: { maximum: 4095 }
-        validates :other, length: { maximum: 29 }
+        validates :estimate_line_add, presence: true
+            
       end
     end
   end

data/lib/qbwc_requests/ordered_fields.rb

@@ -12,21 +12,21 @@ module QbwcRequests
         attr_accessor attribute_name
         validates_each attribute_name do |record, attribute, value|
           if !value.blank? and value.class != klass
-            record.errors.add(attribute, "must be of type #{klass}")
+            record.errors.add(attribute, "must be of type #{klass}") 
           end
         end
       end
-      def ref_to attribute_prefix, name_length=nil
+      def ref_to attribute_prefix, name_length
         attribute_name = "#{attribute_prefix}_ref".to_sym
         @attr_order ||= Set.new
         @attr_order << attribute_name
         attr_accessor attribute_name
         validates_each attribute_name do |record, attribute, value|
-          if value.present?
+          if value.present? 
             if value.is_a?(Hash)
               if !(value[:list_id].present? ^ value[:full_name].present?)
                 record.errors.add(attribute, "Must have list_id or full_name")
-              elsif name_length && value.fetch(:full_name, "").length > name_length
+              elsif value.fetch(:full_name, "").length > name_length
                 record.errors.add(attribute, "- maximum 'full name' length is: #{name_length}")
               end
             else
@@ -61,22 +61,21 @@ module QbwcRequests
       base.extend(ClassMethods)
       base.validates_with(SubModelsValidator)
     end
-
+    
     def ordered_fields
       return {} if self.class.attr_order.blank?
       new_hash = {}
       for attribute in self.class.attr_order
         value = send(attribute)
         if value.present?
-          if value.kind_of?(Array)
-            result = value.map { |item | item.respond_to?(:ordered_fields) ? item.ordered_fields : item }
+          if value.respond_to?(:ordered_fields)
+            new_hash[attribute] = value.ordered_fields
           else
-            result = value.respond_to?(:ordered_fields) ? value.ordered_fields : value
+            new_hash[attribute] = value
           end
-          new_hash[attribute] = result
         end
       end
       new_hash
-    end
+    end   
   end
 end

data/lib/qbwc_requests/sub_models/sales_and_puchase.rb

@@ -1,6 +1,6 @@
 module QbwcRequests
   module SubModels
-    class SalesOrPurchase < QbwcRequests::Base
+    class SalesAndPurchase < QbwcRequests::Base
       field  :sales_desc
       field  :sales_price
       ref_to :income_account, 159

data/lib/qbwc_requests/version.rb

@@ -1,3 +1,3 @@
 module QbwcRequests
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/estimate_qbxml_spec.rb

@@ -11,15 +11,16 @@ RSpec.describe EstimateQbxml do
   describe EstimateQbxml::Add do
 
     it{ is_expected.to validate_field_presence_of :customer_ref }
+    it{ is_expected.to validate_field_presence_of :estimate_line_add }
 
-    let(:estimate) do
+    let(:estimate){ 
       EstimateQbxml::Add.factory(
         customer_ref: {full_name: 'Some customer name'},
-        estimate_line_add: [
-          {item_ref: {full_name: 'item1'}},
-          {item_ref: {full_name: 'item2'}}]
+        estimate_line_add: {
+          item_ref: {full_name: 'Some intem name'}
+        }
       )
-    end
+    }
 
     it "should create an add estimate xml" do
       xml = <<-XML
@@ -34,12 +35,7 @@ RSpec.describe EstimateQbxml do
                 </CustomerRef>
                 <EstimateLineAdd>
                   <ItemRef>
-                    <FullName>item1</FullName>
-                  </ItemRef>
-                </EstimateLineAdd>
-                <EstimateLineAdd>
-                  <ItemRef>
-                    <FullName>item2</FullName>
+                    <FullName>Some intem name</FullName>
                   </ItemRef>
                 </EstimateLineAdd>
               </EstimateAdd>
@@ -49,46 +45,6 @@ RSpec.describe EstimateQbxml do
       XML
       expect( estimate.to_xml("request_id") ).to be_xml_equal_to xml
     end
-  end
-
-  describe EstimateQbxml::Mod do
-
-    it{ is_expected.to validate_field_presence_of :txn_id }
-    it{ is_expected.to validate_field_presence_of :edit_sequence }
-
-    let(:estimate) do
-      EstimateQbxml::Mod.factory(
-        txn_id: 'transaction id',
-        edit_sequence: 'edit sequence',
-        estimate_line_mod: [
-          {txn_line_id: 'line id 1'},
-          {txn_line_id: 'line id 2'}]
-      )
-    end
 
-    it "should create an add estimate xml" do
-      xml = <<-XML
-        <?xml version="1.0" encoding="ISO-8859-1"?>
-        <?qbxml version="7.0"?>
-        <QBXML>
-          <QBXMLMsgsRq onError="stopOnError">
-            <EstimateModRq requestID="request_id">
-              <EstimateMod>
-                <TxnID>transaction id</TxnID>
-                <EditSequence>edit sequence</EditSequence>
-                <EstimateLineMod>
-                  <TxnLineID>line id 1</TxnLineID>
-                </EstimateLineMod>
-                <EstimateLineMod>
-                  <TxnLineID>line id 2</TxnLineID>
-                </EstimateLineMod>
-              </EstimateMod>
-            </EstimateModRq>
-          </QBXMLMsgsRq>
-        </QBXML>
-      XML
-      expect( estimate.to_xml("request_id") ).to be_xml_equal_to xml
-    end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qbwc_requests
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Alexandre Mondaini Calvão
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-09 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: qbxml
@@ -118,7 +118,6 @@ files:
 - lib/qbwc_requests/customer/v07/add.rb
 - lib/qbwc_requests/customer/v07/query.rb
 - lib/qbwc_requests/estimate/v07/add.rb
-- lib/qbwc_requests/estimate/v07/mod.rb
 - lib/qbwc_requests/estimate/v07/query.rb
 - lib/qbwc_requests/factory.rb
 - lib/qbwc_requests/general_detail_report/v07/query.rb
@@ -145,10 +144,6 @@ files:
 - lib/qbwc_requests/purchase_order/v07/mod.rb
 - lib/qbwc_requests/purchase_order/v07/query.rb
 - lib/qbwc_requests/sub_models/address.rb
-- lib/qbwc_requests/sub_models/estimate_line_add.rb
-- lib/qbwc_requests/sub_models/estimate_line_group_add.rb
-- lib/qbwc_requests/sub_models/estimate_line_group_mod.rb
-- lib/qbwc_requests/sub_models/estimate_line_mod.rb
 - lib/qbwc_requests/sub_models/sales_and_puchase.rb
 - lib/qbwc_requests/sub_models/sales_or_puchase.rb
 - lib/qbwc_requests/vendor/v07/add.rb
@@ -254,7 +249,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: This gem helps you generate Qbxml requests

data/lib/qbwc_requests/estimate/v07/mod.rb

@@ -1,40 +0,0 @@
-module QbwcRequests
-  module Estimate
-    module V07
-      class Mod < QbwcRequests::Base
-        field   :txn_id
-        field   :edit_sequence
-        ref_to  :customer, 209
-        ref_to  :class, 159
-        ref_to  :template, 31
-        field   :txn_date
-        field   :ref_number
-        field   :bill_address
-        field   :ship_address
-        field   :is_active
-        field   :create_change_order
-        field   :po_number
-        ref_to  :terms, 31
-        field   :due_date
-        ref_to  :sales_rep, 5
-        field   :fob
-        ref_to  :item_sales_tax, 31
-        field   :memo
-        ref_to  :customer_msg, 101
-        field   :is_to_be_emailed
-        ref_to  :customer_sales_tax_code, 3
-        field   :other
-        field   :estimate_line_mod
-        field   :estimate_line_group_mod
-
-        validates :txn_id, presence: true
-        validates :edit_sequence, presence: true, length: { maximum: 16 }
-        validates :ref_number, length: { maximum: 11 }
-        validates :po_number, length: { maximum: 25 }
-        validates :fob, length: { maximum: 13 }
-        validates :memo, length: { maximum: 4095 }
-        validates :other, length: { maximum: 29 }
-      end
-    end
-  end
-end

data/lib/qbwc_requests/sub_models/estimate_line_add.rb

@@ -1,28 +0,0 @@
-module QbwcRequests
-  module SubModels
-    class EstimateLineAdd < QbwcRequests::Base
-      ref_to  :item
-      field   :desc
-      field   :quantity
-      field   :unit_of_measure
-      field   :rate
-      field   :rate_percent
-      ref_to  :class, 159
-      field   :amount
-      ref_to  :sales_tax_code, 3
-      field   :markup_rate
-      field   :markup_rate_percent
-      ref_to  :price_level, 31
-      ref_to  :override_item_account_ref, 159
-      field   :other1
-      field   :other2
-      field   :data_ext_list
-
-      validates :item, presence: true
-      validates :desc, length: { maximum: 4095 }
-      validates :unit_of_measure, length: { maximum: 31 }
-      validates :other1, length: { maximum: 29 }
-      validates :other2, length: { maximum: 29 }
-    end
-  end
-end

data/lib/qbwc_requests/sub_models/estimate_line_group_add.rb

@@ -1,12 +0,0 @@
-module QbwcRequests
-  module SubModels
-    class EstimateLineGroupAdd < QbwcRequests::Base
-      ref_to  :item_group, 31
-      field   :quantity
-      field   :unit_of_measure
-      field   :data_ext_list
-
-      validates :unit_of_measure, length: { maximum: 31 }
-    end
-  end
-end

data/lib/qbwc_requests/sub_models/estimate_line_group_mod.rb

@@ -1,14 +0,0 @@
-module QbwcRequests
-  module SubModels
-    class EstimateLineGroupMod < QbwcRequests::Base
-      field   :txn_line_id
-      ref_to  :item_group, 31
-      field   :quantity
-      field   :unit_of_measure
-      ref_to  :override_uom_set_ref, 31
-      field   :estimate_line_mod
-
-      validates :unit_of_measure, length: { maximum: 31 }
-    end
-  end
-end

data/lib/qbwc_requests/sub_models/estimate_line_mod.rb

@@ -1,31 +0,0 @@
-module QbwcRequests
-  module SubModels
-    class EstimateLineMod < QbwcRequests::Base
-      field   :txn_line_id
-      ref_to  :item
-      field   :desc
-      field   :quantity
-      field   :unit_of_measure
-      ref_to  :override_uom_set, 31
-      field   :rate
-      field   :rate_percent
-      ref_to  :class, 159
-      field   :amount
-      ref_to  :sales_tax_code, 3
-      field   :markup_rate
-      field   :markup_rate_percent
-      ref_to  :price_level, 31
-      ref_to  :override_item_account_ref, 159
-      field   :other1
-      field   :other2
-      field   :data_ext_list
-
-      validates :txn_line_id, presence: true
-      validates :item, presence: true
-      validates :desc, length: { maximum: 4095 }
-      validates :unit_of_measure, length: { maximum: 31 }
-      validates :other1, length: { maximum: 29 }
-      validates :other2, length: { maximum: 29 }
-    end
-  end
-end