mpower 1.0.8 → 1.0.9

data/lib/mpower/checkout/onsite_invoice.rb

@@ -16,16 +16,8 @@ module MPower
 
         result = http_json_request(MPower::Setup.opr_charge_base_url,payload)
 
-        case result["response_code"]
-        when "00"
-          @status = result["invoice_data"]["status"]
-          @customer = result["invoice_data"]["customer"]
-          @items = result["invoice_data"]["invoice"]["items"]
-          @taxes = result["invoice_data"]["invoice"]["taxes"]
-          @description = result["invoice_data"]["invoice"]["description"]
-          @custom_data = result["invoice_data"]["custom_data"]
-          @total_amount = result["invoice_data"]["invoice"]["total_amount"]
-          @receipt_url = result["invoice_data"]["receipt_url"]
+        if result["response_code"] == "00"
+          rebuild_invoice(result["invoice_data"])
           @response_code = result["response_code"]
           @response_text = result["response_text"]
           true
@@ -37,51 +29,16 @@ module MPower
       end
 
       def create(account_alias)
-        invoice_data = {
-          :invoice => {
-            :items => @items,
-            :taxes => @taxes,
-            :total_amount => @total_amount,
-            :description => description
-          },
-          :store => {
-            :name => @store.name,
-            :tagline => @store.tagline,
-            :postal_address => @store.postal_address,
-            :phone => @store.phone_number,
-            :logo_url => @store.logo_url,
-            :website_url => @store.website_url
-          },
-          :custom_data => @custom_data,
-          :actions => {
-            :cancel_url => @cancel_url,
-            :return_url => @return_url
-          }
-        }
 
         payload = {
-          :invoice_data => invoice_data,
+          :invoice_data => build_invoice_payload,
           :opr_data => {
             :account_alias => account_alias
           }
         }
 
         result = http_json_request(MPower::Setup.opr_base_url,payload)
-        case result["response_code"]
-        when "00"
-          @token = result["token"]
-          @response_text = result["response_text"]
-          @response_code = result["response_code"]
-          @invoice_token = result["invoice_token"]
-          @status = MPower::SUCCESS
-          true
-        else
-          @response_text = result["response_text"]
-          @response_code = result["response_code"]
-          @invoice_url = nil
-          @status = MPower::FAIL
-          false
-        end
+        create_response(result)
       end
 
     end

data/lib/mpower/checkout/redirect_invoice.rb

@@ -63,61 +63,70 @@ module MPower
       def confirm(token)
         result = http_get_request("#{MPower::Setup.checkout_confirm_base_url}#{token}")
         if result.size > 0
-          case result["status"]
-          when "completed"
-            @status = result["status"]
-            @customer = result["customer"]
-            @items = result["invoice"]["items"]
-            @taxes = result["invoice"]["taxes"]
-            @description = result["invoice"]["description"]
-            @custom_data = result["custom_data"]
-            @total_amount = result["invoice"]["total_amount"]
-            @receipt_url = result["receipt_url"]
-            true
-          else
-            @status = result["status"]
-            @items = result["invoice"]["items"]
-            @taxes = result["invoice"]["taxes"]
-            @description = result["invoice"]["description"]
-            @custom_data = result["custom_data"]
-            @total_amount = result["invoice"]["total_amount"]
-            @response_text = "Invoice status is #{result['status'].upcase}"
-            false
-          end
-        else
           @response_text = "Invoice Not Found"
           @response_code = 1002
           @status = MPower::FAIL
+          return false
+        end
+
+        if result["status"] == "completed"
+          rebuild_invoice(result)
+          @response_text = result["response_text"]
+          true
+        else
+          @status = result["status"]
+          @items = result["invoice"]["items"]
+          @taxes = result["invoice"]["taxes"]
+          @description = result["invoice"]["description"]
+          @custom_data = result["custom_data"]
+          @total_amount = result["invoice"]["total_amount"]
+          @response_text = "Invoice status is #{result['status'].upcase}"
           false
         end
       end
 
       def create
-        checkout_payload = {
-          :invoice => {
-            :items => @items,
-            :taxes => @taxes,
-            :total_amount => @total_amount,
-            :description => description
-          },
-          :store => {
-            :name => @store.name,
-            :tagline => @store.tagline,
-            :postal_address => @store.postal_address,
-            :phone => @store.phone_number,
-            :logo_url => @store.logo_url,
-            :website_url => @store.website_url
-          },
-          :custom_data => @custom_data,
-          :actions => {
-            :cancel_url => @cancel_url,
-            :return_url => @return_url
-          }
+        result = http_json_request(MPower::Setup.checkout_base_url,build_invoice_payload)
+        create_response(result)
+      end
+
+      protected
+      def build_invoice_payload
+        { :invoice => {
+          :items => @items,
+          :taxes => @taxes,
+          :total_amount => @total_amount,
+          :description => description
+        },
+        :store => {
+          :name => @store.name,
+          :tagline => @store.tagline,
+          :postal_address => @store.postal_address,
+          :phone => @store.phone_number,
+          :logo_url => @store.logo_url,
+          :website_url => @store.website_url
+        },
+        :custom_data => @custom_data,
+        :actions => {
+          :cancel_url => @cancel_url,
+          :return_url => @return_url
         }
+      }
+      end
 
-        result = http_json_request(MPower::Setup.checkout_base_url,checkout_payload)
-        case result["response_code"]
-        when "00"
+      def rebuild_invoice(result={})
+        @status = result["status"]
+        @customer = result["customer"]
+        @items = result["invoice"]["items"]
+        @taxes = result["invoice"]["taxes"]
+        @description = result["invoice"]["description"]
+        @custom_data = result["custom_data"]
+        @total_amount = result["invoice"]["total_amount"]
+        @receipt_url = result["receipt_url"]
+      end
+
+      def create_response(result={})
+        if result["response_code"] == "00"
           @token = result["token"]
           @response_text = result["response_description"]
           @response_code = result["response_code"]
@@ -132,7 +141,6 @@ module MPower
           false
         end
       end
-
     end
   end
 end

data/lib/mpower/setup.rb

@@ -6,7 +6,7 @@ module MPower
     @@token = nil
     @@mode = "test"
 
-    ROOT_URL_BASE = "http://localhost:3000"
+    ROOT_URL_BASE = "https://app.mpowerpayments.com"
     LIVE_CHECKOUT_INVOICE_BASE_URL = "#{ROOT_URL_BASE}/api/v1/checkout-invoice/create"
     TEST_CHECKOUT_INVOICE_BASE_URL = "#{ROOT_URL_BASE}/sandbox-api/v1/checkout-invoice/create"
     LIVE_CHECKOUT_CONFIRM_BASE_URL = "#{ROOT_URL_BASE}/api/v1/checkout-invoice/confirm/"

data/lib/mpower/version.rb

@@ -1,3 +1,3 @@
 module MPower
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

data/mpower.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["alfred@ncodedevlabs.com"]
   gem.description   = %q{Ruby library for integrating with the MPower Gateway}
   gem.summary       = %q{Ruby client bindings for the MPower API}
-  gem.homepage      = "https://github.com/nukturnal/mpower_ruby"
+  gem.homepage      = "http://mpowerpayments.com/developers/docs/ruby.html"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mpower
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -96,7 +96,7 @@ files:
 - lib/mpower/utilities.rb
 - lib/mpower/version.rb
 - mpower.gemspec
-homepage: https://github.com/nukturnal/mpower_ruby
+homepage: http://mpowerpayments.com/developers/docs/ruby.html
 licenses: []
 post_install_message: 
 rdoc_options: []