papapi 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e93f205e63945cc28ed76ddcbc36c656b347b1ac
-  data.tar.gz: aee3a6970259154e0e7b289becdc88b3395e078f
+  metadata.gz: bb7b535b460dd19762cecf6a09a4d6a85c6687b9
+  data.tar.gz: 14e64d442c7e33eabafaa710788fd67c7e19efe7
 SHA512:
-  metadata.gz: 09f5169ac812e0df8a6f4a4a92cc8724bba2d42c5d00c199f8153651c9cb49283a151fbba93111c1f32dd3be76805b197b0b85285e861dc63c90536730e30eb5
-  data.tar.gz: 11ec2e684f3495b790c0c577ffda30bbfc15879d11a50fe22c017c1d5510be75c158cda4fe934046b45f89a0f34401e4f017619fdea9df8ce9d991ddc016e748
+  metadata.gz: 1d95f4bc72e02c583a9ab36fdde1f64f38f72d811916766ee2c3eb304754e98e4796d80c3de541ed89d0a5fc308089dad756e842081cf54f4cec4e05e4d3fa47
+  data.tar.gz: dfe9b08521ffce7a24a31ab616c0098a96e21a70749805f82debdefda27dc40cd3ebf2212b4bdbb318698bde808e2f7a2cd08cdfde82fe0a12c6bb73f11c1a97

data/lib/papapi/affiliate_commission.rb

@@ -9,6 +9,7 @@ module Papapi
     end
 
     def by_orders(order_ids)
+      commissions = Hash[order_ids.map {|i| [i.to_s, 0.0]}]
       requests = order_ids.map do |order_id|
         r = GridRequest.new("Pap_Affiliates_Reports_TransactionsGrid", "getRows", @session)
         r.set_param("isInitRequest","Y")
@@ -17,7 +18,8 @@ module Papapi
         r
       end
 
-      commissions = Hash[order_ids.map {|i| [i.to_s, 0.0]}]
+      return commissions if requests.length == 0
+
       responses = MultiRequest.new(requests).send
       responses.each do |resp|
         resp.each do |row|

data/lib/papapi/grid_request.rb

@@ -19,14 +19,19 @@ module Papapi
       @columns << [column]
     end
 
+    def set_sorting(column, sort_asc)
+      @sort_col = column
+      @sort_asc = sort_asc
+    end
+
     def to_data
       data = super
       data[:filters] = @filters || []
       data[:columns] = @columns || []
-      data[:sort_col] = sort_col || ""
-      data[:sort_asc] = sort_asc || false
-      data[:offset] = offset || 0
-      data[:limit] = limit || DEFAULT_LIMIT
+      data[:sort_col] = @sort_col || ""
+      data[:sort_asc] = @sort_asc ? true : false
+      data[:offset] = @offset || 0
+      data[:limit] = @limit || DEFAULT_LIMIT
       data
     end
 

data/lib/papapi/merchant_commision.rb

@@ -1,6 +1,8 @@
 module Papapi
   require_relative 'grid_request'
   require_relative 'merchant'
+  require_relative 'request'
+  require_relative 'form_request'
   class Merchant::Commission
 
     def initialize(session)
@@ -32,5 +34,26 @@ module Papapi
       commissions
     end
 
+    def create(affiliate_id, campaign_id, commission, commtypeid, payoutstatus = '', fields = {})
+      r = FormRequest.new('Pap_Merchants_Transaction_TransactionsForm', 'add', @session)
+      f = {
+          :userid => affiliate_id,
+          :campaignid => campaign_id,
+          :commtypeid => commtypeid,
+          :commission => commission,
+          :payoutstatus => payoutstatus,
+          :multiTier => "N"
+      }.merge(fields)
+      r.set_fields(f)
+      r.send
+    end
+
+    def remove(commission_ids)
+      #{"C":"Pap_Merchants_Transaction_TransactionsForm", "M":"deleteRows", "ids":["00a47a09"]
+      r = Request.new('Pap_Merchants_Transaction_TransactionsForm', 'deleteRows', @session)
+      r.set_param('ids', commission_ids)
+      r.send
+    end
+
   end
 end

data/lib/papapi/version.rb

@@ -1,3 +1,3 @@
 module Papapi
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/spec/affiliate_commission_spec.rb

@@ -2,12 +2,18 @@ require 'papapi'
 require 'spec_helper'
 
 RSpec.describe Papapi::Affiliate::Commission do
+  let(:commission) { described_class.new(Papapi::Session.new(script_url).
+                                            login(affiliate_login, affiliate_password, Papapi::Session::AFFILIATE)) }
+
   it "#by_orders" do
-    session = Papapi::Session.new(script_url).login(affiliate_login, affiliate_password, Papapi::Session::AFFILIATE)
-    commission = Papapi::Affiliate::Commission.new(session)
     result = commission.by_orders(['ORD_123', 'test123'])
     expect(result.keys.length).to eq(2)
     expect(result.has_key?('ORD_123')).to be true
     expect(result.has_key?('test123')).to be true
   end
+
+  it "#by_orders(empty)" do
+    result = commission.by_orders([])
+    expect(result.keys.length).to eq(0)
+  end
 end

data/spec/grid_request_spec.rb

@@ -3,16 +3,17 @@ require 'spec_helper'
 
 RSpec.describe Papapi::GridRequest do
 
-  context "load merchant transaction grid" do
+  context "load merchant campaigns" do
     it "#send" do
       merchant_session = Papapi::Session.new(script_url).login(merchant_login, merchant_password)
-      request = Papapi::GridRequest.new("Pap_Merchants_Transaction_TransactionsGrid", "getRows", merchant_session)
-      request.add_filter('userid', 'E', '11111111')
+      request = Papapi::GridRequest.new("Pap_Merchants_Campaign_CampaignsGrid", "getRows", merchant_session)
+      request.set_sorting("rorder", true)
       response = request.send
-      expect(response.count).to be > 1
+      expect(response.count).to be >= 1
     end
   end
 
+=begin
   context "load affiliate transaction grid" do
     it "#send" do
       affiliate_session = Papapi::Session.new(script_url).login(affiliate_login, affiliate_password, Papapi::Session::AFFILIATE)
@@ -21,4 +22,5 @@ RSpec.describe Papapi::GridRequest do
       expect(response.count).to be > 1
     end
   end
+=end
 end

data/spec/merchnat_commision_spec.rb

@@ -2,8 +2,14 @@ require 'papapi'
 require 'spec_helper'
 
 RSpec.describe Papapi::Merchant::Commission do
+  let(:session) { Papapi::Session.new(script_url).login(merchant_login, merchant_password) }
+
+  it "#create" do
+    commission = Papapi::Merchant::Commission.new(session)
+    commission.create('11111111', '11111111', 1.0, '5535d2d7','U')
+  end
+
   it "#by_orders" do
-    session = Papapi::Session.new(script_url).login(merchant_login, merchant_password)
     commission = Papapi::Merchant::Commission.new(session)
     result = commission.by_orders(['ORD_123', 'test123'], '11111111')
     expect(result.keys.length).to eq(2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: papapi
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dmitry Nizovtsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A client for the Post Affiliate Pro API