gotransverse-tract-api 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3747047d9067f773dc326918d902bc2a0c6288af
-  data.tar.gz: 73208d4e051fee1c7a277c49c7c5febb4af723af
+  metadata.gz: ade70bd9064241aa193a7f6345ae4fb9e599287e
+  data.tar.gz: d6d307631ac9f0311d180550a2fc0686660db8fb
 SHA512:
-  metadata.gz: c4a3a20084987c5d168b24b50d9f6e818384f232decb27aa3e8277ef6baed1ad37cd5579723db2aa3f60323b1cf1a39f3b9a05c24881935f566f6ccbd72d95f6
-  data.tar.gz: 9e2b582598fed4ec0f83452234783a6fe9c9b9bc2391c1a27921a6305e020ab22a1037d6b9d804120ea2611b307f4160c30fc92c5487e30285e273e7cec6e41b
+  metadata.gz: 1c415d8bebd84fd852659a4ba1f249feaaf158721c874be40aadebcd60964b22ddfdeabbd8a88942d969e9630c480856bd55571e6e1fd0bdeb3feb4f2deed46c
+  data.tar.gz: eb997a8f6b129821c0e87856ee94b8d95bfe6c9a1998437b846cce0f7d20d297d69a97352f808973e58e2a2e925d920e9f9118f92709f6c3a5e5eee57fc14e80

data/lib/gotransverse-tract-api/billing_account/billing_account.rb

@@ -385,13 +385,42 @@ module GoTransverseTractApi
         # @param {Hash} billing_account
         #
         def create_billing_account billing_account
-          data = {
+          bill_cycle = {}
+          recurring_payments = {}
+
+          bill_type = {
             billingAccount: {
               billType: billing_account[:bill_type]
-            },
-            dailyBillCycle: {
-              eid: billing_account[:daily_bill_cycle][:eid]
-            },
+            }
+          }
+
+          if(billing_account.has_key?(:daily_bill_cycle))
+            bill_cycle = {
+              dailyBillCycle: {
+                eid: billing_account[:daily_bill_cycle][:eid]
+              }
+            }
+          elsif(billing_account.has_key?(:monthly_bill_cycle))
+            bill_cycle = {
+              monthlyBillCycle: {
+                eid: billing_account[:monthly_bill_cycle][:eid]
+              }
+            }
+          elsif(billing_account.has_key?(:quarterly_bill_cycle))
+            bill_cycle = {
+              quarterlyBillCycle: {
+                eid: billing_account[:quarterly_bill_cycle][:eid]
+              }
+            }
+          elsif(billing_account.has_key?(:yearly_bill_cycle))
+            bill_cycle = {
+              yearlyBillCycle: {
+                eid: billing_account[:yearly_bill_cycle][:eid]
+              }
+            }
+          end
+           
+          data = {
             organization: {
               attributes: {
                 name: billing_account[:organization][:name]
@@ -406,6 +435,23 @@ module GoTransverseTractApi
               eid: billing_account[:payment_term][:eid]
             }
           }
+          
+          if(billing_account.has_key?(:recurring_payments))
+            recurring_payments = {
+              recurringPayments: {
+                attributes: {},
+                recurringPayment: {
+                  attributes: {},
+                  referencedCreditCardPaymentMethod: {
+                    referenceKey: billing_account[:recurring_payments][:recurring_payment][:referenced_credit_card_payment_method][:reference_key]
+                  }
+                }
+              }
+            }
+          end
+
+          data = GoTransverseTractApi::ApiData.new.compact(bill_type.merge bill_cycle.merge data.merge recurring_payments)
+
           xml_data = GoTransverseTractApi.generateXML(data, 'billingAccount')
           GoTransverseTractApi.post_request_for(self, {}, xml_data, "")
         end

data/lib/gotransverse-tract-api/order/order_item.rb

@@ -227,6 +227,8 @@ module GoTransverseTractApi
       #
 
       def self.get_order_item(order_item)
+
+        # The following order item keys are optional in TRACT system
         if order_item.has_key?(:price_list)
           price_list = Product::PriceList.get_price_list(order_item[:price_list])
         end
@@ -259,6 +261,10 @@ module GoTransverseTractApi
           agreement_configuration = AgreementConfiguration.get_agreement_conf(order_item[:agreement_configuration])
         end
         
+        if order_item.has_key?(:selected_agreement)
+          selected_agreement = Agreement.get_selected_agreement(order_item[:selected_agreement])
+        end
+
         if order_item.has_key?(:onetime_product_price)
           # We can add later this one as a separate class for getting all other attributes
           onetime_product_price = { 
@@ -268,6 +274,13 @@ module GoTransverseTractApi
           }
         end
         
+        # The parent orderItems may have child orderItems
+        if order_item.has_key?(:order_items)
+          order_items = {
+            attributes: {},
+            orderItem: GoTransverseTractApi::ApiData.new.get_order_items(order_item[:order_items][:order_item])
+          }
+        end
 
         orderItem = {
           attributes: {
@@ -286,8 +299,9 @@ module GoTransverseTractApi
           onetimeProductPrice: onetime_product_price,
           customFieldValues: custom_field_values,
           product: Product::Product.get_product_info(order_item[:product]),
+          orderItems: order_items,
           priceList: price_list,
-          selectedAgreement: Agreement.get_selected_agreement(order_item[:selected_agreement]),
+          selectedAgreement: selected_agreement,
           serviceResources: service_resources,
           inventoryItem: inventory_item, 
           agreementConfiguration: agreement_configuration,

data/lib/gotransverse-tract-api/version.rb

@@ -1,6 +1,6 @@
 module GoTransverseTractApi
 
-  VERSION = "0.15.0"
+  VERSION = "0.16.0"
   TARGET_API_VERSION = "1.29"
 
 end

data/spec/gotransverse-tract-api/billing_account/billing_account_spec.rb

@@ -180,26 +180,58 @@ module GoTransverseTractApi
       end
     end
 
-    context ".create_billing_account" do
-      it "creates a billing account" do
-        data = {
-          bill_type:  'NONE',
-          daily_bill_cycle: { eid:'38' },
-          organization: {
-            name: 'LMH Services',
-            addresses: addresses.delete_if{|k,v| k == :telecom_address}
-          },
-          billing_account_category: {
-            eid: '6'
-          },
-          payment_term: {
-            name: 'Immediate',
-            eid: '8'
+    describe ".create_billing_account" do
+      context "for daily bill cycle" do
+        it "creates a billing account" do
+          data = {
+            bill_type:  'NONE',
+            daily_bill_cycle: { eid:'38' },
+            organization: {
+              name: 'LMH Services',
+              addresses: addresses.delete_if{|k,v| k == :telecom_address}
+            },
+            billing_account_category: {
+              eid: '6'
+            },
+            payment_term: {
+              name: 'Immediate',
+              eid: '8'
+            }
+          }
+
+          allow(subject).to receive(:create_billing_account).with(data).and_return(response)
+          expect(subject.create_billing_account(data)).to eq(response)
+        end
+      end
+
+      context "for monthly bill cycle" do
+        it "creates a billing account" do
+          data = {
+            bill_type:  'EMAIL',
+            monthly_bill_cycle: { eid:'38' },
+            organization: {
+              name: 'LMH Services',
+              addresses: addresses.delete_if{|k,v| k == :telecom_address}
+            },
+            billing_account_category: {
+              eid: '6'
+            },
+            payment_term: {
+              name: 'Immediate',
+              eid: '8'
+            },
+            recurring_payments: {
+              recurring_payment: {
+                referenced_credit_card_payment_method: {
+                  reference_key: '2342gjg224g24h1khk1rweyf93'
+                }
+              }
+            } 
           }
-        }
 
-        allow(subject).to receive(:create_billing_account).with(data).and_return(response)
-        expect(subject.create_billing_account(data)).to eq(response)
+          allow(subject).to receive(:create_billing_account).with(data).and_return(response)
+          expect(subject.create_billing_account(data)).to eq(response)
+        end
       end
     end
 
@@ -340,24 +372,70 @@ module GoTransverseTractApi
           }
         }
       }
-      it "creates a draft sales order without a promo code for the billing account" do
-        allow(subject).to receive(:create_draft_order).with(eid, data).and_return(response)
-        expect(subject.create_draft_order(eid, data)).to eq(response)
+
+      let(:soi_data) { {
+        sales_order: {
+            referral: '',
+            order_date: '2016-01-28T172213',
+            order_status: 'DRAFT',
+            custom_field_values: {
+              custom_field_value: {
+                value: 'ST',
+                custom_field: {eid: '26'}
+              }
+            },
+            order_items: {
+              order_item: {
+                recurring_unit_price: '0.00',
+                quantity:  '1',
+                sequence:  '1',
+                description: 'Data Subscription',
+                product: { eid: '111' },
+                recurring_product_price: { eid: '294' },
+                order_items: {
+                  order_item: {
+                    recurring_unit_price: '0.10',
+                    quantity:  '1500',
+                    sequence:  '2',
+                    description: 'LAP',
+                    product: { eid: '110' },
+                    recurring_product_price: { eid: '301' }
+                  }
+                }
+              }
+            },
+            billing_account: { eid: eid }
+          }
+        }
+      }
+
+      context "when SOI upsell products" do
+        it "creates a draft sales order without a promo code for the billing account" do
+          allow(subject).to receive(:create_draft_order).with(eid, soi_data).and_return(response)
+          expect(subject.create_draft_order(eid, soi_data)).to eq(response)
+        end
       end
 
-      it "creates a draft sales order with promo code for the billing account" do
-        promo_code = {
-          discount_configurations: {
-            discount_configuration: {
-              discount_identifier: { eid:'35' }
+      context "when no SOI upsell products" do
+        it "creates a draft sales order without a promo code for the billing account" do
+          allow(subject).to receive(:create_draft_order).with(eid, data).and_return(response)
+          expect(subject.create_draft_order(eid, data)).to eq(response)
+        end
+
+        it "creates a draft sales order with promo code for the billing account" do
+          promo_code = {
+            discount_configurations: {
+              discount_configuration: {
+                discount_identifier: { eid:'35' }
+              }
             }
           }
-        }
 
-        [0,1].each { |i| data[:sales_order][:order_items][:order_item][i].merge! promo_code }
+          [0,1].each { |i| data[:sales_order][:order_items][:order_item][i].merge! promo_code }
 
-        allow(subject).to receive(:create_draft_order).with(eid, data).and_return(response)
-        expect(subject.create_draft_order(eid, data)).to eq(response)
+          allow(subject).to receive(:create_draft_order).with(eid, data).and_return(response)
+          expect(subject.create_draft_order(eid, data)).to eq(response)
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gotransverse-tract-api
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - Julien DeFrance
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-18 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -259,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A ruby gem allowing developers to conveniently integrate with GoTransverse's