qbwc_requests 0.1.03 → 0.2.0

data/README.md

@@ -1,7 +1,9 @@
-# QbwcRequests
+# Qbwc Requests
 
 With qbwc_requests you have an easy way to create Qbxml requests.
 
+[![Build Status](https://semaphoreci.com/api/v1/projects/c357ba42-3d3e-4061-985e-6c3c9c68a9b4/557601/badge.svg)](https://semaphoreci.com/apotema/qbwc_requests)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -19,7 +21,7 @@ Or install it yourself as:
 ## Usage
 
 * Query Requisitions
-  
+
   ```ruby
     Qbwc::Request::V07::Account.query
   ```
@@ -43,7 +45,7 @@ That will create an Account query for the qbxml version 7.0
 * Add Requisitions
 
   ```ruby
-    Qbwc::Request::V07::Account.new(name: 'Some Account name').add
+    Qbwc::Request::V07::Account.new(name: 'Some Account name').add("2")
   ```
 
   result  
@@ -95,7 +97,7 @@ Right now we just have the following models on this gem.
 - Invoices
 - Estimates
 
-The Qbxml version for this models is the 7.0.
+The Qbxml version for this models is the 7.0
 
 
 ## Contributing
@@ -104,4 +106,4 @@ The Qbxml version for this models is the 7.0.
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request

data/lib/qbwc_requests/qbwc/request/base.rb

@@ -1,4 +1,4 @@
-module Qbwc 
+module Qbwc
   module Request
     class Base
 
@@ -7,13 +7,17 @@ module Qbwc
       include ActiveModel::Validations
       include ActiveModel::Conversion
 
-      def self.query options = nil
+      def self.query options = nil, header = nil
         options = { max_returned: 2000 } if options == nil or options.empty?
-        XmlActions.query "#{underscore self.name.demodulize}_query_rq", options
+        XmlActions.query "#{underscore self.name.demodulize}_query_rq", options, header
       end
-      
-      def add
-        self.valid? ? add_xml : self
+
+      def modify request_id
+        modify_xml request_id
+      end
+
+      def add request_id
+        self.valid? ? add_xml(request_id) : self
       end
 
       def initialize(attributes = {})
@@ -44,20 +48,30 @@ module Qbwc
         def compact opts={}
           # I pass two times to avoid {v: '1',k: {}}, gotta find a better algorithm (recursive)
           return {} if opts.nil?
-          proc = Proc.new { |k, v| v.kind_of?(Hash) ? (v.delete_if(&proc); nil) : (v == nil || v.empty?) };
+          proc = Proc.new { |k, v| v.kind_of?(Hash) ? (v.delete_if(&proc); nil) : (v == nil || (v.respond_to?(:empty) && v.empty?)) };
           hash = opts.delete_if(&proc)
-          hash.delete_if { |k, v| (v == nil || v.empty?) }
+          hash.delete_if { |k, v| (v == nil || (v.respond_to?(:empty) && v.empty?)) }
         end
 
-        def add_xml
+        def add_xml request_id
           req = XmlActions.header
           req['qbxml']['qbxml_msgs_rq']["#{class_name}_add_rq"] = {"xml_attributes"=>
-              {"requestID"=>"2"},
+              {"requestID"=>"#{request_id}"},
                 "#{class_name}_add"=> self.ordered_fields
               }
           XmlActions.to_xml(req)
         end
 
+
+        def modify_xml request_id
+          req = XmlActions.header
+          req['qbxml']['qbxml_msgs_rq']["#{class_name}_mod_rq"] = {"xml_attributes"=>
+              {"requestID"=>"#{request_id}"},
+                "#{class_name}_mod"=> self.ordered_fields
+              }
+          XmlActions.to_xml(req)
+        end
+
     end
   end
 end

data/lib/qbwc_requests/qbwc/request/v07/general_detail_report.rb

@@ -0,0 +1,11 @@
+module Qbwc 
+  module Request
+    module V07
+      class GeneralDetailReport < Qbwc::Request::Base
+
+        
+        
+      end
+    end
+  end
+end

data/lib/qbwc_requests/qbwc/request/v07/item.rb

@@ -1,9 +1,9 @@
-module Qbwc 
+module Qbwc
   module Request
     module V07
       class Item
         def self.query
-          XmlActions.query "item_query_rq", max_returned: 2000
+          XmlActions.query "item_query_rq", {max_returned: 2000}, {}
         end
       end
     end

data/lib/qbwc_requests/qbwc/request/v07/purchase_order.rb

@@ -1,4 +1,4 @@
-module Qbwc 
+module Qbwc
   module Request
     module V07
       class PurchaseOrder < Qbwc::Request::Base
@@ -26,7 +26,12 @@ module Qbwc
         field :other2
         field :purchase_order_line_add
         field :purchase_order_line_group_add
-        
+
+        #MODIFICATION FIELDS
+        field :purchase_order_line_mod
+        field :txn_ID
+        field :edit_sequence
+
       end
     end
   end

data/lib/qbwc_requests/qbwc/request/v07/vendor.rb

@@ -1,4 +1,4 @@
-module Qbwc 
+module Qbwc
   module Request
     module V07
       class Vendor < Qbwc::Request::Base
@@ -10,15 +10,21 @@ module Qbwc
         field :first_name
         field :middle_name
         field :last_name
+        field :vendor_address
         field :phone
+        field :alt_phone
+        field :fax
         field :email
         field :contact
+        field :alt_contact
         field :name_on_check
+        field :account_number
+        field :notes
         field :is_vendor_eligible_for_1099
         field :open_balance
 
         validates :name, presence: true
-        
+
       end
     end
   end

data/lib/qbwc_requests/qbwc/request/v07/vendor_address.rb

@@ -0,0 +1,17 @@
+module Qbwc
+  module Request
+    module V07
+      class VendorAddress < Qbwc::Request::Base
+
+        field :addr1
+        field :addr2
+        field :addr3
+        field :addr4
+        field :city
+        field :state
+        field :postal_code
+
+      end
+    end
+  end
+end

data/lib/qbwc_requests/qbwc/xml_actions.rb

@@ -1,19 +1,27 @@
 module Qbwc
   module XmlActions
 
-    def self.query req, options
+    def self.query req, options, header
       hash = {"qbxml"=>
-              {"xml_attributes"=>{},
+              {"xml_attributes"=> {},
                "qbxml_msgs_rq"=>
-                {"xml_attributes"=>{"onError"=>"stopOnError"},
+                {"xml_attributes" => {"onError"=>"stopOnError"},
                  "#{req}"=>
-                  {"xml_attributes"=>{}}.merge(options)
+                  {"xml_attributes"=> self.header_attributes(header)}.merge(options)
                 }
               }
             }
       self.to_xml(hash)
     end
 
+    def self.header_attributes attributes = {}
+      hash = {}
+      if attributes
+        hash["requestID"] = attributes["requestID"] if attributes["requestID"]
+      end
+      hash
+    end
+
     def self.header
       {"qbxml"=>
         {"xml_attributes"=>{}, "qbxml_msgs_rq"=>

data/lib/qbwc_requests/version.rb

@@ -1,3 +1,3 @@
 module QbwcRequests
-  VERSION = "0.1.03"
+  VERSION = "0.2.0"
 end

data/spec/qbwc/request/base_spec.rb

@@ -8,12 +8,12 @@ class GenericBase < Qbwc::Request::Base
 end
 
 describe GenericBase do
-  
+
   describe '#initialize' do
 
     it 'should deal with nil values' do
       expect {
-        GenericBase.new(nil)  
+        GenericBase.new(nil)
       }.to_not raise_error
     end
 
@@ -35,7 +35,7 @@ describe GenericBase do
 
     it 'should not raise error for nil values' do
       expect {
-        GenericBase.new(parameters).add()
+        GenericBase.new(parameters).add("request_id")
       }.to_not raise_error
     end
 
@@ -46,13 +46,13 @@ describe GenericBase do
         <?qbxml version="7.0"?>
         <QBXML>
           <QBXMLMsgsRq onError="stopOnError">
-            <GenericBaseAddRq requestID="2">
+            <GenericBaseAddRq requestID="request_id">
               <GenericBaseAdd></GenericBaseAdd>
             </GenericBaseAddRq>
           </QBXMLMsgsRq>
         </QBXML>
       XML
-      add_xml = GenericBase.new(parameters).add()
+      add_xml = GenericBase.new(parameters).add("request_id")
       expect( add_xml ).to be_xml_equal_to expected_xml
     end
 

data/spec/qbwc/request/v07/account_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Qbwc::Request::V07::Account do
-  
+
   it_behaves_like 'queryable'
 
   it { is_expected.to validate_field_presence_of :name }
@@ -16,7 +16,7 @@ RSpec.describe Qbwc::Request::V07::Account do
         <?qbxml version="7.0"?>
         <QBXML>
           <QBXMLMsgsRq onError="stopOnError">
-            <AccountAddRq requestID="2">
+            <AccountAddRq requestID="request_id">
               <AccountAdd>
                 <Name>a</Name>
               </AccountAdd>
@@ -24,9 +24,9 @@ RSpec.describe Qbwc::Request::V07::Account do
           </QBXMLMsgsRq>
         </QBXML>
       XML
-      expect( account.add ).to be_xml_equal_to xml
+      expect( account.add("request_id") ).to be_xml_equal_to xml
     end
 
   end
 
-end
+end

data/spec/qbwc/request/v07/bill_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Qbwc::Request::V07::Bill do
-  
+
   it_behaves_like 'queryable'
 
   describe "add" do
@@ -14,14 +14,14 @@ RSpec.describe Qbwc::Request::V07::Bill do
         <?qbxml version="7.0"?>
         <QBXML>
           <QBXMLMsgsRq onError="stopOnError">
-            <BillAddRq requestID="2">
+            <BillAddRq requestID="request_id">
               <BillAdd>
               </BillAdd>
             </BillAddRq>
           </QBXMLMsgsRq>
         </QBXML>
       XML
-      expect( bill.add ).to be_xml_equal_to xml
+      expect( bill.add("request_id") ).to be_xml_equal_to xml
     end
 
   end

data/spec/qbwc/request/v07/customer_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Qbwc::Request::V07::Customer do
-  
+
   it_behaves_like 'queryable'
 
   it { is_expected.to validate_field_presence_of :name }
@@ -16,7 +16,7 @@ RSpec.describe Qbwc::Request::V07::Customer do
         <?qbxml version="7.0"?>
         <QBXML>
           <QBXMLMsgsRq onError="stopOnError">
-            <CustomerAddRq requestID="2">
+            <CustomerAddRq requestID="request_id">
               <CustomerAdd>
                 <Name>a</Name>
               </CustomerAdd>
@@ -24,9 +24,9 @@ RSpec.describe Qbwc::Request::V07::Customer do
           </QBXMLMsgsRq>
         </QBXML>
       XML
-      expect( customer.add ).to be_xml_equal_to xml
+      expect( customer.add("request_id") ).to be_xml_equal_to xml
     end
 
   end
 
-end
+end

data/spec/qbwc/request/v07/estimate_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
 RSpec.describe Qbwc::Request::V07::Estimate do
-  
+
   it_behaves_like 'queryable'
 
   it{ is_expected.to validate_field_presence_of :customer_ref }
   it{ is_expected.to validate_field_presence_of :estimate_line_add }
 
   describe "add" do
-  
+
     let(:estimate){ Qbwc::Request::V07::Estimate.new(customer_ref: {full_name: 'Some customer name'}, estimate_line_add: {item_ref: {full_name: 'Some intem name'}}) }
 
-    it "should create an add estimate xml" do  
+    it "should create an add estimate xml" do
       xml = <<-XML
         <?xml version='1.0' encoding='utf-8'?>
         <?qbxml version="7.0"?>
         <QBXML>
           <QBXMLMsgsRq onError="stopOnError">
-            <EstimateAddRq requestID="2">
+            <EstimateAddRq requestID="request_id">
               <EstimateAdd>
                 <CustomerRef>
                   <FullName>Some customer name</FullName>
@@ -32,8 +32,8 @@ RSpec.describe Qbwc::Request::V07::Estimate do
           </QBXMLMsgsRq>
         </QBXML>
       XML
-      expect( estimate.add ).to be_xml_equal_to xml
+      expect( estimate.add("request_id") ).to be_xml_equal_to xml
     end
-  
+
   end
-end
+end

data/spec/qbwc/request/v07/general_detail_report_spec.rb

@@ -0,0 +1,7 @@
+require 'spec_helper'
+
+RSpec.describe Qbwc::Request::V07::GeneralDetailReport do
+  
+  it_behaves_like 'queryable'
+
+end

data/spec/qbwc/request/v07/invoice_spec.rb

@@ -1,23 +1,23 @@
 require 'spec_helper'
 
 RSpec.describe Qbwc::Request::V07::Invoice do
-  
+
   it_behaves_like 'queryable'
 
   it{ is_expected.to validate_field_presence_of :customer_ref }
   it{ is_expected.to validate_field_presence_of :invoice_line_add }
 
   describe "add" do
-    
+
     let(:invoice){ Qbwc::Request::V07::Invoice.new(customer_ref: {full_name: 'Some customer name'}, invoice_line_add: {item_ref: {full_name: 'Some item name'}}) }
 
-    it "should create an add invoice xml" do  
+    it "should create an add invoice xml" do
       xml = <<-XML
         <?xml version='1.0' encoding='utf-8'?>
         <?qbxml version="7.0"?>
         <QBXML>
           <QBXMLMsgsRq onError="stopOnError">
-            <InvoiceAddRq requestID="2">
+            <InvoiceAddRq requestID="request_id">
               <InvoiceAdd>
                 <CustomerRef>
                   <FullName>Some customer name</FullName>
@@ -32,8 +32,8 @@ RSpec.describe Qbwc::Request::V07::Invoice do
           </QBXMLMsgsRq>
         </QBXML>
       XML
-      expect( invoice.add ).to be_xml_equal_to xml
+      expect( invoice.add("request_id") ).to be_xml_equal_to xml
     end
 
   end
-end
+end