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/discounts_controller.rb
+++ b/app/controllers/origami/discounts_controller.rb
@@ -273,7 +273,7 @@ class Origami::DiscountsController < BaseOrigamiController
                                             auth_token:auth_token}.to_json,
                                  :headers => {
                                      'Content-Type' => 'application/json',
-                                      'Accept'       => 'application/json; version=2'
+                                      'Accept'       => 'application/json; version=3'
                           }, :timeout => 10)
          rescue HTTParty::Error
            response = {"status": false, "message": "Can't open membership server " }