Pull from master

2018-03-15 13:48:52 +06:30
parent 96f8640df7
commit 1188f6e8e9
29 changed files with 242 additions and 97 deletions
--- a/app/controllers/origami/voucher_controller.rb
+++ b/app/controllers/origami/voucher_controller.rb
@@ -54,7 +54,7 @@ class Origami::VoucherController < BaseOrigamiController
                                  }.to_json,
                        :headers => {
                                  'Content-Type' => 'application/json',
-                                  'Accept' => 'application/json; version=2'
+                                  'Accept' => 'application/json; version=3'
                        }, :timeout => 10
                  )
              rescue Net::OpenTimeout