paykassa 0.1.13 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97ac6966e736f2779ec3b847fc2bf88ee3b3192d1601512ecc94118078942d54
-  data.tar.gz: bdf6715b98585c00d3a6705e1043dcebdbf7a3995d6a4c11230f994bd5677b7c
+  metadata.gz: 8f08dc918608da07c348a716eb133e57187372b3158adc369bbbb0cb41a6cf53
+  data.tar.gz: 68bc52b31422fb2786d8ee7e0f998ecac762e2b4143114e92cdb876e6986075d
 SHA512:
-  metadata.gz: 1e74e4b7e184840bc564c28937f1f858d18a8a373e641b23dd0e700fc908242d8da7d0adb45bd774801730e4f6b92dcf07d7211508ae8108708f8f4d4918c208
-  data.tar.gz: 2d300c7b4fc22958285a2625deeff6d9e4f263faf19765d4a263f3e317c8a6f734d96751a8fa1c3395b446f1ecc99b57a16971cf3245b1aebcb406bc0e63866b
+  metadata.gz: 1c4d4c81018e7276636b68f2c1b73950ba31725c9704ebd35b8e357543c2b65fe50a0f37b15a2842dfd685e6a19e8ce6e9db559b42ad9f136828f2cf20a5b10e
+  data.tar.gz: bf549917ae04e06a5c85be261b1d3003ceae524e20c29e6afc6587898bca17b4cf008b6e262734ceedcfd230c336ca11b50fc8632e3fcb7856bb2610cbd9bb93

data/Gemfile

@@ -8,3 +8,4 @@ gemspec
 gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
+gem 'logger', "~> 1.4.3"

data/lib/paykassa/order.rb

@@ -6,20 +6,37 @@ class PaykassaOrder
 
   # def initialize(auth)
   # where auth has keys: sci_id, sci_key, domain
-  def initialize(auth, logger = nil)
+  def initialize(auth, logger = nil, test = false)
     @logger = logger
     @_auth = auth
+    @test = test
   end
 
   # Request for create order
-  def create_order(amount:, currency:, order_id:, comment:, system:)
+  def create_order(amount: , currency:, order_id:, paid_commision: , comment:, system:)
     make_request(
       func: :sci_create_order,
       amount: amount,
       currency: currency,
       order_id: order_id,
+      phone: "false",
+      paid_commission: paid_commision,
       comment: comment,
-      system: system
+      system: system,
+      test: @test.to_s
+    )
+  end
+  def get_data(amount: , currency:, order_id:, paid_commision: , comment:, system:)
+    make_request(
+      func: :sci_create_order_get_data,
+      amount: amount,
+      currency: currency,
+      order_id: order_id,
+      phone: "false",
+      paid_commission: paid_commision,
+      comment: comment,
+      system: system,
+      test: @test.to_s
     )
   end
 

data/lib/paykassa/pay.rb

@@ -1,5 +1,5 @@
 require 'net/http'
-
+require 'logger'
 class PaykassaPay 
     BASE_URL = URI("https://paykassa.app/api/0.5/index.php")
     RATE_URL = URI("https://currency.paykassa.pro/index.php")
@@ -28,6 +28,7 @@ class PaykassaPay
         ethereum_erc20: 32
     }
     def initialize(domain:, api_id:, api_key:, test: false, logger: nil)
+        @logger = logger
         @logger.info("Initialize class Pay with params: domain: #{domain}, api_id: #{api_id}, api_key: #{api_key}, test: #{test}") if !@logger.nil?
         @token = api_key
         @_auth = {domain: domain, api_id: api_id, api_key: api_key, test: test}
@@ -43,17 +44,21 @@ class PaykassaPay
             tag: tag, 
             priority: priority
         }
-        @logger.info("Pay.pay with data: #{data.inspect}") if !@logger.nil?
+        @logger.info("Pay.pay with data: #{data.inspect}") unless @logger.nil?
         make_request("api_payment",data)
     end
     def balance(shop: ) 
         data = {
             shop: shop,
-            pi_id: @_auth[:api_id], 
+            api_id: @_auth[:api_id], 
             api_key: @_auth[:api_key]
         }
-        @logger.info("Pay.balance with data: #{data.inspect}") if !@logger.nil?
-        make_request("api_get_shop_balance", data, false)
+        @logger.info("Pay.balance with data: #{data.inspect}") unless @logger.nil?
+        make_request(
+            func: "api_get_shop_balance", 
+            data: data, 
+            merge_auth: false
+        )
     end
     def currency_rate(inn:,out:)
         if !CURRENCIES.include? inn 
@@ -68,20 +73,20 @@ class PaykassaPay
         }
         @logger.info("Pay.currency_rate with data: #{data.inspect}") if !@logger.nil?
         make_request(
-            nil,
-            data,
-            false, 
-            RATE_URL
+            func: nil,
+            data: data,
+            merge_auth: false, 
+            url: RATE_URL
         )
     end
     private
-    def  make_request(func,data,merge_auth = true, url= nil)
+    def  make_request(func:,data: ,merge_auth: , url: nil)
         data = data.merge({func: func}) if !func.nil?
         data = data.merge(@_auth) if merge_auth
         url = BASE_URL if url.nil?
-        @logger.info("private Pay.make_request with params: url: #{url.inspect}, data: #{data.inspect}") if !@logger.nil?
+        @logger.info("private Pay.make_request with params: url: #{url.inspect}, data: #{data.inspect}") unless @logger.nil?
         res = Net::HTTP.post_form(url, data)
-        @logger.info("private Pay.make_request: result: #{res.inspect}") if !@logger.nil?
+        @logger.info("private Pay.make_request: result: #{res.inspect}") unless @logger.nil?
         JSON.parse(res.body).deep_symbolize_keys
     end
 

data/lib/paykassa/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Paykassa
-  VERSION = "0.1.13"
+  VERSION = "0.1.16"
 end

data/lib/paykassa.rb

@@ -3,20 +3,20 @@
 require_relative "paykassa/version"
 require_relative "paykassa/order"
 require_relative "paykassa/pay"
+require 'logger'
 module Paykassa
   class Error < StandardError; end
   class Paykassa 
     def initialize(domain:, sci_id:, sci_key:, api_id: nil, api_key: nil, test:, logger: nil)
-
-      @logger=logger
-      puts "logger paykassa: #{@logger.inspect}"
-      @paykassa_order = PaykassaOrder.new({domain: domain, sci_id: sci_id, sci_key: sci_key}, logger)
+      @logger = Logger.new(logger) unless logger.nil? 
+      
+      @paykassa_order = PaykassaOrder.new({domain: domain, sci_id: sci_id, sci_key: sci_key}, @logger, test)
       if api_id.nil? 
         @paykassa_pay = nil
       else
         @paykassa_pay = PaykassaPay.new(
             domain: domain, api_id: api_id,
-            api_key: api_key, test: test, logger: logger
+            api_key: api_key, test: test, logger: @logger
         )
       end
     end
@@ -42,13 +42,24 @@ module Paykassa
     def rate(c_in, c_out) 
       @paykassa_pay.currency_rate(c_in, c_out)
     end
-
-    def create_order(amount:, currency:, order_id:, system:, comment: "from paykassa gem")
+    def get_order_address(amount: , currency:, order_id:, paid_commision: , comment: "from paykassa gem", system:)
+      order =  @paykassa_order.get_data( amount: amount,
+        currency: currency,
+        order_id: order_id,
+        phone: "false",
+        paid_commission: paid_commision,
+        comment: comment,
+        system: system
+      )
+    end
+    def create_order(amount: , currency:, order_id:, paid_commision: , comment: "from paykassa gem", system:)
       order = @paykassa_order.create_order(
-        amount: amount, 
-        currency: currency, 
-        order_id: order_id, 
-        comment: comment, 
+        amount: amount,
+        currency: currency,
+        order_id: order_id,
+        phone: "false",
+        paid_commission: paid_commision,
+        comment: comment,
         system: system
       )
       raise StandardError.new(order[:message]) if order[:error]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paykassa
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.16
 platform: ruby
 authors:
 - nottewae
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-06 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet