payanyway 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22312df92c434d0cc5fbb014278ea412e847ef2f
-  data.tar.gz: 56360ecc662d971c93fb290b11b4e6d75a69a134
+  metadata.gz: 3a0a0e0745722668f5893b61306d535affb3a9e5
+  data.tar.gz: 88d266eefee02daf3a17c69878e83009d9056b49
 SHA512:
-  metadata.gz: 68e88399e7e7b18faf28d8a343e72845786be52c5b465b70adde9201a7d545cc910cd0ad62bf2a3cac070b4845f9c496ba87db3009c7c18264ad586fd768d9ab
-  data.tar.gz: 5e6066b8f26391772aed9a00a2c09a244198e3dd60f8bc5cf04c2e5d03df7aba454f58649ff5b9eb27b56edce1dc6f1cd09e3480e37df2d88812c0b854e2b771
+  metadata.gz: f98d5adf7ea7d1a7fe9adc5b02a9c127413759bb99e30d8565cb73659a1582964e9382cbc99155497cce8e1112ed034f0531386c66cffe62541bed8d60e500af
+  data.tar.gz: 963062a553120424ad51cc7bca9cd7690032d960a889930304146089d80d912ef8e9af2b66e8ddc6023430ad32f6b32cad3fba3710224e0f8b16925a93fe091f

data/README.md

@@ -83,6 +83,11 @@ production: <<: *config
     payment_url: https://moneta.ru/assistant.htm
     test_mode: 0
 ```
+
+В настройках счета **moneta.ru** выберите `HTTP метод: GET`
+
+![Settings](https://raw.github.com/ssnikolay/payanyway/master/settings.png)
+
 ##<a name="usage"></a> Использование
 
 ###<a name="payment_url"></a> Запрос на оплату

data/lib/payanyway/helpers/signature_generator.rb

@@ -4,6 +4,7 @@ module Payanyway
   module Helpers
     class SignatureGenerate
       BASE_KEYS = %w(
+        moneta_id
         MNT_TRANSACTION_ID
         MNT_OPERATION_ID
         MNT_AMOUNT
@@ -31,11 +32,17 @@ module Payanyway
         def generate_by(params, keys)
           values = keys.map { |key| get_value(params, key) }.join
 
-          md5(Payanyway::Gateway.config['moneta_id'].to_s + values + Payanyway::Gateway.config['token'])
+          md5(values + Payanyway::Gateway.config['token'])
         end
 
         def get_value(params, key)
-          (key == 'MNT_AMOUNT' && params[key].present?) ? '%.2f' % params[key] : params[key]
+          if key == 'MNT_AMOUNT' && params[key].present?
+            '%.2f' % params[key]
+          elsif key == 'moneta_id'
+            Payanyway::Gateway.config['moneta_id'].to_s
+          else
+            params[key]
+          end
         end
 
         def md5(str)

data/lib/payanyway/version.rb

@@ -1,3 +1,3 @@
 module Payanyway
-  VERSION = '1.2.2'
+  VERSION = '1.2.3'
 end

data/spec/lib/payanyway/request/check_spec.rb

@@ -38,7 +38,7 @@ describe Payanyway::Request::Check do
             <MNT_RESULT_CODE>402</MNT_RESULT_CODE>
             <MNT_DESCRIPTION>Заказ создан, но не оплачен</MNT_DESCRIPTION>
             <MNT_AMOUNT>10.2</MNT_AMOUNT>
-            <MNT_SIGNATURE>061c2b859c27c75db9e5bbef3aef90a0</MNT_SIGNATURE>
+            <MNT_SIGNATURE>11cf20faee5e4b2b89808a09e4f6bfeb</MNT_SIGNATURE>
           </MNT_RESPONSE>
         EOXML
         expected_xml = Nokogiri::XML(expected, nil, 'UTF-8')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: payanyway
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - ssnikolay
 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: rails
@@ -178,6 +178,7 @@ files:
 - lib/payanyway/request/pay.rb
 - lib/payanyway/version.rb
 - payanyway.gemspec
+- settings.png
 - spec/config/payanyway_spec.rb
 - spec/config/routes_spec.rb
 - spec/controllers/payanyway_controller_spec.rb