paykassa 0.1.14 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26c11f0db3dfc5f18296b5b1e0c79ac355779450761e474592afd8ee2858dcea
-  data.tar.gz: 037fe1c05ab96dd6ebbdd375d866cd2482331e160a1c2fa925700375c565cb0f
+  metadata.gz: 8e3593a8efb9f87d15ae638745fa20b92222155605b70b51114fbaf77afe28d2
+  data.tar.gz: 3b0113e6185dbd9fa1e62109fd6e9e4c7adea32546cefcdbd61b9bf27ec001f4
 SHA512:
-  metadata.gz: 7ad1d0361ff740429c2764e9d18ce78d3429488fd386ab6996114826687967f153e9a8349cdfefd58fd94f83fbdec7d6a7cfc20b1347267f87018c56b26679bd
-  data.tar.gz: c597e77fea7f06fa07ddd4571004cb5e3c2daf63ce1cf98fb441c1e4e3b3192a84e023a6c71d6b18d5efec2f5b84e3b26c7781ec7ac2c9d4b7bdcf3ff6211ae5
+  metadata.gz: d0012c0e1e99aea0ed3473c76f6fd2825456d124f22d9fed61cc3946110c4fb70e206f32bb47ffa687fbe7db94c41c7cd50edeed79c62f352bb351f71a1e364d
+  data.tar.gz: f48c8bfed4f650ac94a26bdf0a03304b03df16fcb18c1f81f8a4580ee93dddf45c3e34e63c2a7803f48eeae93a5e977382ce0f552ebee5f3a248b1f8073c9d53

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

@@ -2,24 +2,61 @@ require 'net/http'
 
 class PaykassaOrder
   BASE_SCI_URI = URI('https://paykassa.pro/sci/0.3/index.php')
-
+  CURRENCIES=[
+    "USD", "RUB", "BTC", "ETH", "LTC", "DOGE", "DASH", "BCH", "ZEC",
+    "XRP", "TRX", "XLM", "BNB", "USDT", "ADA", "EOS", "GBP", "EUR", 
+    "USDC", "BUSD"
+  ]
+    SYSTEM_IDS = {
+        perfectmoney: 2,
+        berty: 7,
+        bitcoin: 11,
+        ethereum: 12,
+        litecoin: 14,
+        dogecoin: 15,
+        dash: 16,
+        bitcoincash: 18,
+        zcash: 19,
+        ripple: 22,
+        tron: 27,
+        stellar: 28,
+        binancecoin: 29,
+        tron_trc20: 30,
+        binancesmartchain_bep20: 31, # available currencies USDT, BUSD, USDC, ADA, EOS, BTC, ETH, DOGE    
+        ethereum_erc20: 32
+    }
 
   # 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_IDS[system]
+    )
+  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
+      system: SYSTEM_IDS[system]
     )
   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,7 +44,7 @@ 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: ) 
@@ -52,8 +53,12 @@ class PaykassaPay
             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.14"
+  VERSION = "0.1.17"
 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,26 @@ 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
+      )
+      raise StandardError.new(order[:message]) if order[:error]
+      order
+    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.14
+  version: 0.1.17
 platform: ruby
 authors:
 - nottewae
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-11 00:00:00.000000000 Z
+date: 2022-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redcarpet